--- C:\Program Files\SecondLifeReleaseCandidate5untouched\skins\xui\en-us\menu_viewer.xml	2008-04-28 22:18:44.000000000 -0700
+++ C:\Program Files\SecondLifeReleaseCandidate5\skins\xui\en-us\menu_viewer.xml	2008-05-04 14:01:01.531250000 -0700
@@ -30,71 +30,39 @@
 		</menu_item_call>
 		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="243" />
-		<menu_item_call bottom="-113" enabled="true" height="19" label="Close Window" left="0"
+                <menu_item_call bottom="-113" enabled="true" height="19" label="Snapshot to Disk" left="0"
+		     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
+		     useMacCtrl="true" width="243">
+			<on_click function="File.TakeSnapshotToDisk" userdata="" />
+		</menu_item_call>
+                <menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="243" />
+		<menu_item_call bottom="-140" enabled="true" height="19" label="Close Window" left="0"
 		     mouse_opaque="true" name="Close Window" shortcut="control|W" width="243">
 			<on_click function="File.CloseWindow" userdata="" />
 			<on_enable function="File.EnableCloseWindow" userdata="" />
 		</menu_item_call>
-		<menu_item_call bottom="-113" enabled="true" height="19" label="Close All Windows" left="0"
+		<menu_item_call bottom="-159" enabled="true" height="19" label="Close All Windows" left="0"
 		     mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
 		     width="243">
 			<on_click function="File.CloseAllWindows" userdata="" />
 			<on_enable function="File.EnableCloseAllWindows" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator2" width="243" />
-		<menu_item_call bottom="-140" enabled="true" height="19" label="Save Texture As..." left="0"
+		<menu_item_call bottom="-186" enabled="true" height="19" label="Save Texture As..." left="0"
 		     mouse_opaque="true" name="Save Texture As..." width="243">
 			<on_click function="File.SaveTexture" userdata="" />
 			<on_enable function="File.EnableSaveAs" />
 		</menu_item_call>
-		<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator3" width="243" />
-		<menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
-		     mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
-		     width="243">
-			<on_click function="File.TakeSnapshot" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
-		     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
-		     useMacCtrl="true" width="243">
-			<on_click function="File.TakeSnapshotToDisk" userdata="" />
-		</menu_item_call>
 		<menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator4" width="243" />
-		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-		     height="117" label="Set Window Size" left="0" mouse_opaque="false"
-		     name="Set Window Size" opaque="true" tear_off="true" width="125">
-			<menu_item_call bottom="-29" enabled="true" height="19" label="320x240" left="0"
-			     mouse_opaque="true" name="320x240" width="125">
-				<on_click function="File.SetWindowSize" userdata="320,240" />
-			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="true" height="19" label="640x480" left="0"
-			     mouse_opaque="true" name="640x480" width="125">
-				<on_click function="File.SetWindowSize" userdata="640,480" />
-			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="true" height="19" label="800x600" left="0"
-			     mouse_opaque="true" name="800x600" width="125">
-				<on_click function="File.SetWindowSize" userdata="800,600" />
-			</menu_item_call>
-			<menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator" width="125" />
-			<menu_item_call bottom="-94" enabled="true" height="19" label="720x480 (NTSC)" left="0"
-			     mouse_opaque="true" name="720x480 (NTSC)" width="125">
-				<on_click function="File.SetWindowSize" userdata="720,480" />
-			</menu_item_call>
-			<menu_item_call bottom="-113" enabled="true" height="19" label="768x576 (PAL)" left="0"
-			     mouse_opaque="true" name="768x576 (PAL)" width="125">
-				<on_click function="File.SetWindowSize" userdata="768,576" />
-			</menu_item_call>
-		</menu>
-		<menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator5" width="243" />
-		<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
+		<menu_item_call bottom="-213" enabled="true" height="19" label="Quit" left="0"
 		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
 			<on_click function="File.Quit" userdata="" />
 		</menu_item_call>
 	</menu>
+        
 	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
 	     height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
 	     opaque="true" tear_off="true" width="153">
@@ -125,37 +93,14 @@
 			<on_click function="Edit.Paste" userdata="" />
 			<on_enable function="Edit.EnablePaste" />
 		</menu_item_call>
-		<menu_item_call bottom="-132" enabled="false" height="19" label="Delete" left="0"
-		     mouse_opaque="true" name="Delete" shortcut="Del" width="153">
-			<on_click function="Edit.Delete" userdata="" />
-			<on_enable function="Edit.EnableDelete" />
-		</menu_item_call>
-		<menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator2" width="153" />
-		<menu_item_call bottom="-159" enabled="true" height="19" label="Search..." left="0"
-		     mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
-			<on_click function="Edit.Search" userdata="" />
-		</menu_item_call>
-		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
+                <menu_item_separator bottom="-132" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator3" width="153" />
-		<menu_item_call bottom="-186" enabled="false" height="19" label="Select All" left="0"
+		<menu_item_call bottom="-140" enabled="false" height="19" label="Select All" left="0"
 		     mouse_opaque="true" name="Select All" shortcut="control|A" width="153">
 			<on_click function="Edit.SelectAll" userdata="" />
 			<on_enable function="Edit.EnableSelectAll" />
 		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="false" height="19" label="Deselect" left="0"
-		     mouse_opaque="true" name="Deselect" shortcut="control|E" width="153">
-			<on_click function="Edit.Deselect" userdata="" />
-			<on_enable function="Edit.EnableDeselect" />
-		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator4" width="153" />
-		<menu_item_call bottom="-232" enabled="false" height="19" label="Duplicate" left="0"
-		     mouse_opaque="true" name="Duplicate" shortcut="control|D" width="153">
-			<on_click function="Edit.Duplicate" userdata="" />
-			<on_enable function="Edit.EnableDuplicate" />
-		</menu_item_call>
-		<menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator5" width="153" />
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
 		     height="554" label="Attach Object" left="0" mouse_opaque="false"
@@ -218,34 +163,34 @@
 		</menu>
 		<menu_item_separator bottom="-305" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator6" width="153" />
-		<menu_item_call bottom="-324" enabled="true" height="19" label="Gestures..." left="0"
+		<menu_item_call bottom="-313" enabled="true" height="19" label="Gestures..." left="0"
 		     mouse_opaque="true" name="Gestures..." shortcut="control|G" width="153">
 			<on_click function="ShowFloater" userdata="gestures" />
 		</menu_item_call>
-		<menu_item_call bottom="-343" enabled="true" height="19" label="Profile..." left="0"
+		<menu_item_call bottom="-332" enabled="true" height="19" label="Profile..." left="0"
 		     mouse_opaque="true" name="Profile..." width="153">
 			<on_click function="ShowAgentProfile" userdata="agent" />
 		</menu_item_call>
-		<menu_item_call bottom="-362" enabled="true" height="19" label="Appearance..." left="0"
+		<menu_item_call bottom="-351" enabled="true" height="19" label="Appearance..." left="0"
 		     mouse_opaque="true" name="Appearance..." width="153">
 			<on_click function="ShowFloater" userdata="appearance" />
 			<on_enable function="Edit.EnableCustomizeAvatar" />
 		</menu_item_call>
-		<menu_item_separator bottom="-370" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-359" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator7" width="153" />
-		<menu_item_check bottom="-389" enabled="true" height="19" label="Friends..." left="0"
+		<menu_item_check bottom="-378" enabled="true" height="19" label="Friends..." left="0"
 		     mouse_opaque="true" name="Friends..." shortcut="control|shift|F"
 		     width="153">
 			<on_click function="ShowFloater" userdata="friends" />
 			<on_check function="FloaterVisible" userdata="friends" />
 		</menu_item_check>
-		<menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
+		<menu_item_call bottom="-397" enabled="true" height="19" label="Groups..." left="0"
 		     mouse_opaque="true" name="Groups..." width="153">
 			<on_click function="ShowAgentGroups" userdata="agent" />
 		</menu_item_call>
-		<menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-415" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator8" width="153" />
-		<menu_item_call bottom="-435" enabled="true" height="19" label="Preferences..." left="0"
+		<menu_item_call bottom="-434" enabled="true" height="19" label="Preferences..." left="0"
 		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
 			<on_click function="ShowFloater" userdata="preferences" />
 		</menu_item_call>
@@ -255,136 +200,233 @@
 	     opaque="true" tear_off="true" width="211">
 		<tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
 		     mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
-		     mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
-			<on_click function="View.Mouselook" userdata="" />
-			<on_enable function="View.EnableMouselook" />
-		</menu_item_call>
-		<menu_item_check bottom="-48" enabled="true" height="19" label="Build" left="0"
-		     mouse_opaque="true" name="Build" shortcut="B" width="211">
-			<on_click function="View.BuildMode" userdata="" />
-			<on_check function="View.CheckBuildMode" />
-		</menu_item_check>
-		<menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
-		     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
-		     width="211">
-			<on_click function="View.JoystickFlycam" userdata="" />
-			<on_check function="View.CheckJoystickFlycam" />
-		</menu_item_check>
-		<menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
-		     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
-			<on_click function="View.ResetView" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-86" enabled="false" height="19" label="Look at Last Chatter" left="0"
-		     mouse_opaque="true" name="Look at Last Chatter" shortcut="control|\"
-		     width="211">
-			<on_click function="View.LookAtLastChatter" userdata="" />
-			<on_enable function="View.EnableLastChatter" />
-		</menu_item_call>
-		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
+                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="109" label="Select Tool" left="0" mouse_opaque="false"
+		     name="Select Tool" opaque="true" tear_off="true" width="118">
+			<menu_item_call bottom="-29" enabled="true" height="19" label="Focus" left="0"
+			     mouse_opaque="true" name="Focus" shortcut="control|1" width="118">
+				<on_click function="Tools.SelectTool" userdata="focus" />
+			</menu_item_call>
+			<menu_item_call bottom="-48" enabled="true" height="19" label="Move" left="0"
+			     mouse_opaque="true" name="Move" shortcut="control|2" width="118">
+				<on_click function="Tools.SelectTool" userdata="move" />
+			</menu_item_call>
+			<menu_item_call bottom="-67" enabled="true" height="19" label="Edit" left="0"
+			     mouse_opaque="true" name="Edit" shortcut="control|3" width="118">
+				<on_click function="Tools.SelectTool" userdata="edit" />
+			</menu_item_call>
+			<menu_item_call bottom="-86" enabled="true" height="19" label="Build" left="0"
+			     mouse_opaque="true" name="Create" shortcut="control|4" width="118">
+				<on_click function="Tools.SelectTool" userdata="create" />
+			</menu_item_call>
+			<menu_item_call bottom="-105" enabled="true" height="19" label="Land" left="0"
+			     mouse_opaque="true" name="Land" shortcut="control|5" width="118">
+				<on_click function="Tools.SelectTool" userdata="land" />
+			</menu_item_call>
+		</menu>
+                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="211" />
-		<menu_item_check bottom="-113" enabled="true" height="19" label="Toolbar" left="0"
-		     mouse_opaque="true" name="Toolbar" width="211">
-			<on_click function="ShowFloater" userdata="toolbar" />
-			<on_check function="FloaterVisible" userdata="toolbar" />
-		</menu_item_check>
-		<menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
+		<menu_item_check bottom="-113" enabled="true" height="19" label="Local Chat" left="0"
 		     mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
 			<on_click function="ShowFloater" userdata="chat history" />
 			<on_check function="FloaterVisible" userdata="chat history" />
 		</menu_item_check>
-		<menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
+		<menu_item_check bottom="-132" enabled="true" height="19" label="Communicate" left="0"
 		     mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
 			<on_click function="ShowFloater" userdata="im" />
 			<on_check function="FloaterVisible" userdata="im" />
 		</menu_item_check>
-		<menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
+                <menu_item_call bottom="-151" enabled="true" height="19" label="Search" left="0"
+		     mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
+			<on_click function="Edit.Search" userdata="" />
+		</menu_item_call>
+                <menu_item_check bottom="-160" enabled="true" height="19" hidden="false" label="Build" left="0"
+		     mouse_opaque="true" name="Build" shortcut="B" width="211">
+			<on_click function="View.BuildMode" userdata="" />
+			<on_check function="View.CheckBuildMode" />
+		</menu_item_check>
+                <menu_item_check bottom="-179" enabled="true" height="19" label="World Map" left="0"
+		     mouse_opaque="true" name="World Map" shortcut="control|M" width="211">
+			<on_click function="ShowFloater" userdata="world map" />
+			<on_check control="ShowWorldMap" />
+		</menu_item_check>
+		<menu_item_check bottom="-198" enabled="true" height="19" label="Mini-Map" left="0"
+		     mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M" width="211">
+			<on_click function="ShowFloater" userdata="mini map" />
+			<on_check control="ShowMiniMap" />
+		</menu_item_check>
+                <menu_item_call bottom="-217" enabled="true" height="19" label="Inventory" left="0"
 		     mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
 			<on_click function="ShowFloater" userdata="inventory" />
 		</menu_item_call>
-		<menu_item_check bottom="-189" enabled="true" height="19" label="Active Speakers" left="0"
+                <menu_item_separator bottom="-225" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="211" />
+		<menu_item_check bottom="-244" enabled="true" height="19" label="Active Speakers" left="0"
 		     mouse_opaque="true" name="Active Speakers" width="211">
 			<on_click function="ShowFloater" userdata="active speakers" />
 			<on_check function="FloaterVisible" userdata="active speakers" />
 		</menu_item_check>
-		<menu_item_check bottom="-189" enabled="true" height="19" label="Mute List" left="0"
+		<menu_item_check bottom="-263" enabled="true" height="19" label="Mute List" left="0"
 		     mouse_opaque="true" name="Mute List" width="211">
 			<on_click function="ShowFloater" userdata="mute list" />
 			<on_check function="FloaterVisible" userdata="mute list" />
 		</menu_item_check>
-		<menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-271" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator2" width="211" />
-		<menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
+		<menu_item_check bottom="-290" enabled="true" height="19" label="Camera Controls" left="0"
 		     mouse_opaque="true" name="Camera Controls" width="211">
 			<on_click function="ShowFloater" userdata="camera controls" />
 			<on_check function="FloaterVisible" userdata="camera controls" />
 		</menu_item_check>
-		<menu_item_check bottom="-235" enabled="true" height="19" label="Movement Controls" left="0"
+		<menu_item_check bottom="-309" enabled="true" height="19" label="Movement Controls" left="0"
 		     mouse_opaque="true" name="Movement Controls" width="211">
 			<on_click function="ShowFloater" userdata="movement controls" />
 			<on_check function="FloaterVisible" userdata="movement controls" />
 		</menu_item_check>
-		<menu_item_check bottom="-254" enabled="true" height="19" label="World Map" left="0"
-		     mouse_opaque="true" name="World Map" shortcut="control|M" width="211">
-			<on_click function="ShowFloater" userdata="world map" />
-			<on_check control="ShowWorldMap" />
-		</menu_item_check>
-		<menu_item_check bottom="-273" enabled="true" height="19" label="Mini-Map" left="0"
-		     mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M" width="211">
-			<on_click function="ShowFloater" userdata="mini map" />
-			<on_check control="ShowMiniMap" />
-		</menu_item_check>
-		<menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator3" width="211" />
-		<menu_item_check bottom="-300" enabled="true" height="19" label="Statistics Bar" left="0"
-		     mouse_opaque="true" name="Statistics Bar" shortcut="control|shift|1"
+		<menu_item_check bottom="-328" enabled="true" height="19" label="Joystick Flycam" left="0"
+		     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
 		     width="211">
-			<on_click function="ShowFloater" userdata="stat bar" />
-			<on_check function="FloaterVisible" userdata="stat bar" />
+			<on_click function="View.JoystickFlycam" userdata="" />
+			<on_check function="View.CheckJoystickFlycam" />
 		</menu_item_check>
-		<menu_item_check bottom="-319" enabled="true" height="19" label="Property Lines" left="0"
-		     mouse_opaque="true" name="Property Lines" shortcut="control|alt|shift|P"
-		     width="211">
-			<on_click function="ToggleControl" userdata="ShowPropertyLines" />
-			<on_check control="ShowPropertyLines" />
+                <menu_item_separator bottom="-336" enabled="true" height="8" label="-----------" left="0"
+                     mouse_opaque="true" name="separator7" width="250" />
+                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="109" label="Info Display" left="0" mouse_opaque="false"
+		     name="Info Display" opaque="true" tear_off="true" width="118">
+                        <menu_item_call bottom="-213" enabled="true" height="19" label="Bumps, Pushes &amp; Hits..."
+                        left="0" mouse_opaque="true" name="Bumps, Pushes &amp;amp; Hits..."
+                        width="166">
+                           <on_click function="ShowFloater" userdata="mean events" />
+                        </menu_item_call>
+                  	<menu_item_call label="Lag Meter" name="Lag Meter">
+                           <on_click function="ShowFloater" userdata="lag meter" />
+                        </menu_item_call>
+                        <menu_item_check bottom="-300" enabled="true" height="19" label="Statistics Bar" left="0"
+                        mouse_opaque="true" name="Statistics Bar" shortcut="control|shift|1"
+                        width="211">
+                           <on_click function="ShowFloater" userdata="stat bar" />
+                           <on_check function="FloaterVisible" userdata="stat bar" />
+                        </menu_item_check>
+                </menu>
+                <menu_item_separator bottom="-342" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="211" />
+		<menu_item_call bottom="-361" enabled="true" height="19" label="About Land..." left="0"
+		     mouse_opaque="true" name="About Land..." width="185">
+			<on_click function="ShowFloater" userdata="about land" />
+		</menu_item_call>
+		<menu_item_call bottom="-380" enabled="true" height="19" label="My Land..." left="0"
+		     mouse_opaque="true" name="My Land..." width="185">
+			<on_click function="ShowFloater" userdata="my land" />
+		</menu_item_call>
+		<menu_item_call bottom="-399" enabled="true" height="19" label="Region/Estate..." left="0"
+		     mouse_opaque="true" name="Region/Estate..." width="185">
+			<on_click function="ShowFloater" userdata="about region" />
+		</menu_item_call>
+		<menu_item_separator bottom="-407" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="169" />
+	        <menu_item_call bottom="-426" enabled="false" height="19" label="Environment Editor" left="0"
+		     mouse_opaque="true" name="Environment Editor" width="169">
+			<on_click function="World.EnvSettings" userdata="editor" />
+	        </menu_item_call>
+	</menu>
+
+	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="339" label="World" left="0" mouse_opaque="false" name="World"
+	     opaque="true" tear_off="true" width="185">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Take Snapshot" left="0"
+		     mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
+		     width="243">
+			<on_click function="File.TakeSnapshot" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="185" />
+                <menu_item_call bottom="-56" enabled="true" height="19" label="Chat" left="0"
+		     mouse_opaque="true" name="Chat" shortcut="" width="185">
+			<on_click function="World.Chat" userdata="" />
+		</menu_item_call>
+		<menu_item_check bottom="-75" enabled="true" height="19" label="Fly" left="0"
+		     mouse_opaque="true" name="Fly" shortcut="Home" width="185">
+			<on_click function="World.Fly" userdata="" />
+			<on_check control="FlyBtnState" />
 		</menu_item_check>
-		<menu_item_check bottom="-338" enabled="true" height="19" label="Land Owners" left="0"
-		     mouse_opaque="true" name="Land Owners" width="211">
-			<on_click function="ToggleControl" userdata="ShowParcelOwners" />
-			<on_check control="ShowParcelOwners" />
+		<menu_item_check bottom="-94" enabled="true" height="19" label="Always Run" left="0"
+		     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
+			<on_click function="World.AlwaysRun" userdata="" />
+			<on_check function="World.CheckAlwaysRun" userdata="" />
 		</menu_item_check>
-		<menu_item_separator bottom="-346" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator4" width="211" />
-		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-		     height="79" label="Hover Tips" left="0" mouse_opaque="false"
-		     name="Hover Tips" opaque="true" tear_off="true" width="158">
-			<menu_item_check bottom="-29" enabled="true" height="19" label="Show Tips" left="0"
-			     mouse_opaque="true" name="Show Tips" shortcut="control|shift|T" width="158">
-				<on_click function="View.ShowHoverTips" userdata="" />
-				<on_check function="View.CheckShowHoverTips" />
-			</menu_item_check>
-			<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator" width="158" />
-			<menu_item_check bottom="-56" enabled="true" height="19" label="Land Tips" left="0"
-			     mouse_opaque="true" name="Land Tips" width="158">
-				<on_click function="ToggleControl" userdata="ShowLandHoverTip" />
-				<on_enable function="View.CheckShowHoverTips" />
-				<on_check control="ShowLandHoverTip" />
-			</menu_item_check>
-			<menu_item_check bottom="-75" enabled="true" height="19" label="Tips On All Objects" left="0"
-			     mouse_opaque="true" name="Tips On All Objects" width="158">
-				<on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
-				<on_enable function="View.CheckShowHoverTips" />
-				<on_check control="ShowAllObjectHoverTip" />
-			</menu_item_check>
-		</menu>
-		<menu_item_check bottom="-403" enabled="true" height="19" label="Highlight Transparent" left="0"
+                <menu_item_call bottom="-113" enabled="false" height="19" label="Look at Last Chatter" left="0"
+		     mouse_opaque="true" name="Look at Last Chatter" shortcut="control|\"
+		     width="211">
+			<on_click function="View.LookAtLastChatter" userdata="" />
+			<on_enable function="View.EnableLastChatter" />
+		</menu_item_call>
+		<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="185" />
+                <menu_item_call bottom="-140" enabled="false" height="19" label="Stop All Animations" left="0"
+		     mouse_opaque="true" name="Stop All Animations" width="250">
+			<on_click function="Tools.StopAllAnimations" userdata="" />
+		</menu_item_call>
+                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator3" width="185" />
+		<menu_item_call bottom="-167" enabled="true" height="19" label="Set Away" left="0"
+		     mouse_opaque="true" name="Set Away" width="185">
+			<on_click function="World.SetAway" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-186" enabled="true" height="19" label="Set Busy" left="0"
+		     mouse_opaque="true" name="Set Busy" width="185">
+			<on_click function="World.SetBusy" userdata="" />
+		</menu_item_call>
+                <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator" width="185" />
+		<menu_item_call bottom="-213" enabled="true" height="19" label="Create Landmark Here" left="0"
+		     mouse_opaque="true" name="Create Landmark Here" width="185">
+			<on_click function="World.CreateLandmark" userdata="" />
+			<on_enable function="World.EnableCreateLandmark" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-232" enabled="true" height="19" label="Set Home to Here" left="0"
+		     mouse_opaque="true" name="Set Home to Here" width="185">
+			<on_click function="World.SetHomeLocation" userdata="" />
+			<on_enable function="World.EnableSetHomeLocation" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator2" width="185" />
+		<menu_item_call bottom="-259" enabled="true" height="19" label="Teleport Home" left="0"
+		     mouse_opaque="true" name="Teleport Home" shortcut="control|shift|H"
+		     width="185">
+			<on_click function="World.TeleportHome" userdata="" />
+			<on_enable function="World.EnableTeleportHome" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-267" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="185" />
+                <menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
+		     mouse_opaque="true" name="Buy and Sell L$..." width="166">
+			<on_click function="ShowFloater" userdata="buy currency" />
+		</menu_item_call>
+                <menu_item_call bottom="-305" enabled="true" height="19" label="Buy Land..." left="0"
+		     mouse_opaque="true" name="Buy Land..." width="185">
+			<on_click function="ShowFloater" userdata="buy land" />
+			<on_enable function="World.EnableBuyLand" />
+		</menu_item_call>
+		<menu_item_call bottom="-324" enabled="true" height="19" label="Account History..." left="0"
+		     mouse_opaque="true" name="Account History..." width="185">
+			<on_click function="PromptShowURL"
+			     userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
+		</menu_item_call>
+		<menu_item_call bottom="-343" enabled="true" height="19" label="Manage My Account..." left="0"
+		     mouse_opaque="true" name="Manage My Account..." width="166">
+			<on_click function="PromptShowURL"
+			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
+		</menu_item_call>
+                <menu_item_separator bottom="-351" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="185" />
+		<menu_item_check bottom="-370" enabled="true" height="19" label="Highlight Transparent" left="0"
 		     mouse_opaque="true" name="Highlight Transparent" shortcut="control|alt|T"
 		     width="211">
 			<on_click function="View.HighlightTransparent" userdata="" />
 			<on_check function="View.CheckHighlightTransparent" />
 		</menu_item_check>
-		<menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
+		<menu_item_check bottom="-389" enabled="true" height="19" label="Beacons Always On" left="0"
 		     mouse_opaque="true" name="Beacons Always On" shortcut="control|N"
 		     width="211">
 			<on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
@@ -462,128 +504,21 @@
 				</menu_item_call>
 			</menu>
 		</menu>
-		<menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
-		     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
-		     width="211">
-			<on_click function="View.ShowHUDAttachments" userdata="" />
-			<on_check function="View.CheckHUDAttachments" />
-		</menu_item_check>
-		<menu_item_separator bottom="-449" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator5" width="211" />
-		<menu_item_call bottom="-468" enabled="true" height="19" label="Zoom In" left="0"
-		     mouse_opaque="true" name="Zoom In" shortcut="control|0" width="211">
-			<on_click function="View.ZoomIn" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-487" enabled="true" height="19" label="Zoom Default" left="0"
-		     mouse_opaque="true" name="Zoom Default" shortcut="control|9" width="211">
-			<on_click function="View.ZoomDefault" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-506" enabled="true" height="19" label="Zoom Out" left="0"
-		     mouse_opaque="true" name="Zoom Out" shortcut="control|8" width="211">
-			<on_click function="View.ZoomOut" userdata="" />
-		</menu_item_call>
-		<menu_item_separator bottom="-514" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator6" width="211" />
-		<menu_item_call bottom="-19" enabled="true" height="19" label="Toggle Fullscreen" left="0"
-		     mouse_opaque="true" name="Toggle Fullscreen" shortcut="alt|Enter"
-		     width="188">
-			<on_click function="View.Fullscreen" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-38" enabled="true" height="19" label="Set UI Size to Default" left="0"
-		     mouse_opaque="true" name="Set UI Size to Default" width="188">
-			<on_click function="View.DefaultUISize" userdata="" />
-		</menu_item_call>
-	</menu>
-	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="339" label="World" left="0" mouse_opaque="false" name="World"
-	     opaque="true" tear_off="true" width="185">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
-		     mouse_opaque="true" name="Chat" shortcut="" width="185">
-			<on_click function="World.Chat" userdata="" />
-		</menu_item_call>
-		<menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
-		     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
-			<on_click function="World.AlwaysRun" userdata="" />
-			<on_check function="World.CheckAlwaysRun" userdata="" />
+                <menu_item_check bottom="-408" enabled="true" height="19" label="Land Owners" left="0"
+		     mouse_opaque="true" name="Land Owners" width="211">
+			<on_click function="ToggleControl" userdata="ShowParcelOwners" />
+			<on_check control="ShowParcelOwners" />
 		</menu_item_check>
-		<menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
-		     mouse_opaque="true" name="Fly" shortcut="Home" width="185">
-			<on_click function="World.Fly" userdata="" />
-			<on_check control="FlyBtnState" />
+                <menu_item_check bottom="-427" enabled="true" height="19" label="Property Lines" left="0"
+		     mouse_opaque="true" name="Property Lines" shortcut="control|alt|shift|P"
+		     width="211">
+			<on_click function="ToggleControl" userdata="ShowPropertyLines" />
+			<on_check control="ShowPropertyLines" />
 		</menu_item_check>
-		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator" width="185" />
-		<menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
-		     mouse_opaque="true" name="Create Landmark Here" width="185">
-			<on_click function="World.CreateLandmark" userdata="" />
-			<on_enable function="World.EnableCreateLandmark" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
-		     mouse_opaque="true" name="Set Home to Here" width="185">
-			<on_click function="World.SetHomeLocation" userdata="" />
-			<on_enable function="World.EnableSetHomeLocation" userdata="" />
-		</menu_item_call>
-		<menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator2" width="185" />
-		<menu_item_call bottom="-159" enabled="true" height="19" label="Teleport Home" left="0"
-		     mouse_opaque="true" name="Teleport Home" shortcut="control|shift|H"
-		     width="185">
-			<on_click function="World.TeleportHome" userdata="" />
-			<on_enable function="World.EnableTeleportHome" userdata="" />
-		</menu_item_call>
-		<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator3" width="185" />
-		<menu_item_call bottom="-186" enabled="true" height="19" label="Set Away" left="0"
-		     mouse_opaque="true" name="Set Away" width="185">
-			<on_click function="World.SetAway" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="true" height="19" label="Set Busy" left="0"
-		     mouse_opaque="true" name="Set Busy" width="185">
-			<on_click function="World.SetBusy" userdata="" />
-		</menu_item_call>
-		<menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
-		     mouse_opaque="true" name="Stop All Animations" width="250">
-			<on_click function="Tools.StopAllAnimations" userdata="" />
-		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator4" width="185" />
-		<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
-		     mouse_opaque="true" name="Account History..." width="185">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
-		</menu_item_call>
-		<menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
-		     mouse_opaque="true" name="Manage My Account..." width="166">
-			<on_click function="PromptShowURL"
-			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
-		</menu_item_call>
-		<menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
-		     mouse_opaque="true" name="Buy and Sell L$..." width="166">
-			<on_click function="ShowFloater" userdata="buy currency" />
-		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator5" width="185" />
-		<menu_item_call bottom="-251" enabled="true" height="19" label="My Land..." left="0"
-		     mouse_opaque="true" name="My Land..." width="185">
-			<on_click function="ShowFloater" userdata="my land" />
-		</menu_item_call>
-		<menu_item_call bottom="-270" enabled="true" height="19" label="About Land..." left="0"
-		     mouse_opaque="true" name="About Land..." width="185">
-			<on_click function="ShowFloater" userdata="about land" />
-		</menu_item_call>
-		<menu_item_call bottom="-289" enabled="true" height="19" label="Buy Land..." left="0"
-		     mouse_opaque="true" name="Buy Land..." width="185">
-			<on_click function="ShowFloater" userdata="buy land" />
-			<on_enable function="World.EnableBuyLand" />
-		</menu_item_call>
-		<menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
-		     mouse_opaque="true" name="Region/Estate..." width="185">
-			<on_click function="ShowFloater" userdata="about region" />
-		</menu_item_call>
-		<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-435" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator6" width="185" />
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-		     height="117" label="Environment Settings" left="0" mouse_opaque="false"
+		     height="117" label="Sun Settings" left="0" mouse_opaque="false"
 		     name="Environment Settings" opaque="true" tear_off="true" width="169">
 			<menu_item_call bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
 			     mouse_opaque="true" name="Sunrise" width="169">
@@ -605,41 +540,39 @@
 			     left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
 				<on_click function="World.EnvSettings" userdata="default" />
 			</menu_item_call>
-			<menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator" width="169" />
-			<menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
-			     mouse_opaque="true" name="Environment Editor" width="169">
-				<on_click function="World.EnvSettings" userdata="editor" />
-			</menu_item_call>
 		</menu>
 	</menu>
+        
 	<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
 	     height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
 	     opaque="true" tear_off="true" visible="false" width="250">
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-		     height="109" label="Select Tool" left="0" mouse_opaque="false"
-		     name="Select Tool" opaque="true" tear_off="true" width="118">
-			<menu_item_call bottom="-29" enabled="true" height="19" label="Focus" left="0"
-			     mouse_opaque="true" name="Focus" shortcut="control|1" width="118">
-				<on_click function="Tools.SelectTool" userdata="focus" />
-			</menu_item_call>
-			<menu_item_call bottom="-48" enabled="true" height="19" label="Move" left="0"
-			     mouse_opaque="true" name="Move" shortcut="control|2" width="118">
-				<on_click function="Tools.SelectTool" userdata="move" />
-			</menu_item_call>
-			<menu_item_call bottom="-67" enabled="true" height="19" label="Edit" left="0"
-			     mouse_opaque="true" name="Edit" shortcut="control|3" width="118">
-				<on_click function="Tools.SelectTool" userdata="edit" />
-			</menu_item_call>
-			<menu_item_call bottom="-86" enabled="true" height="19" label="Create" left="0"
-			     mouse_opaque="true" name="Create" shortcut="control|4" width="118">
-				<on_click function="Tools.SelectTool" userdata="create" />
-			</menu_item_call>
-			<menu_item_call bottom="-105" enabled="true" height="19" label="Land" left="0"
-			     mouse_opaque="true" name="Land" shortcut="control|5" width="118">
-				<on_click function="Tools.SelectTool" userdata="land" />
-			</menu_item_call>
-		</menu>
+		     height="109" label="Scripts" left="0" mouse_opaque="false"
+		     name="Scripts" opaque="true" tear_off="true" width="118">
+			<menu_item_call bottom="-430" enabled="true" height="19"
+                           label="Show Script Warning/Error Window" left="0" mouse_opaque="true"
+                           name="Show Script Warning/Error Window" width="250">
+                             <on_click function="ShowFloater" userdata="script errors" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
+                           left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
+                           <on_click function="Tools.SelectedScriptAction" userdata="reset" />
+                           <on_enable function="EditableSelected" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-487" enabled="false" height="19"
+                           label="Set Scripts to Running in Selection" left="0" mouse_opaque="true"
+                           name="Set Scripts to Running in Selection" width="250">
+                              <on_click function="Tools.SelectedScriptAction" userdata="start" />
+                            <on_enable function="EditableSelected" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-506" enabled="false" height="19"
+                           label="Set Scripts to Not Running in Selection" left="0"
+                           mouse_opaque="true" name="Set Scripts to Not Running in Selection"
+                           width="250">
+                              <on_click function="Tools.SelectedScriptAction" userdata="stop" />
+                              <on_enable function="EditableSelected" />
+                        </menu_item_call>
+                  </menu>
 		<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="250" />
 		<menu_item_check bottom="-56" enabled="true" height="19" label="Select Only My Objects" left="0"
@@ -701,6 +634,33 @@
 		</menu_item_call>
 		<menu_item_separator bottom="-243" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator3" width="250" />
+                <menu_item_call bottom="-262" enabled="false" height="19" label="Deselect" left="0"
+		     mouse_opaque="true" name="Deselect" shortcut="control|E" width="153">
+			<on_click function="Edit.Deselect" userdata="" />
+			<on_enable function="Edit.EnableDeselect" />
+		</menu_item_call>
+                <menu_item_call bottom="-381" enabled="false" height="19" label="Buy Object" left="0"
+		     mouse_opaque="true" name="Menu Object Take" visible="false" width="250">
+			<on_click function="Tools.BuyOrTake" userdata="" />
+			<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
+		</menu_item_call>
+		<menu_item_call bottom="-400" enabled="false" height="19" label="Take Copy" left="0"
+		     mouse_opaque="true" name="Take Copy" width="250">
+			<on_click function="Tools.TakeCopy" userdata="" />
+			<on_enable function="Tools.EnableTakeCopy" />
+		</menu_item_call>
+		<menu_item_call bottom="-419" enabled="false" height="19" label="Duplicate" left="0"
+		     mouse_opaque="true" name="Duplicate" shortcut="control|D" width="153">
+			<on_click function="Edit.Duplicate" userdata="" />
+			<on_enable function="Edit.EnableDuplicate" />
+		</menu_item_call>
+                <menu_item_call bottom="-438" enabled="false" height="19" label="Delete" left="0"
+		     mouse_opaque="true" name="Delete" shortcut="Del" width="153">
+			<on_click function="Edit.Delete" userdata="" />
+			<on_enable function="Edit.EnableDelete" />
+		</menu_item_call>
+                <menu_item_separator bottom="-446" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="153" />
 		<menu_item_check bottom="" enabled="false" height="" label="Edit Linked Parts" left=""
 		     mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
 			<on_click function="ToggleControl" userdata="EditLinkedParts" />
@@ -708,82 +668,122 @@
 			<on_check control="EditLinkedParts" />
 			<on_enable function="Tools.EnableToolNotPie" />
 		</menu_item_check>
-		<menu_item_call bottom="-262" enabled="false" height="19" label="Link" left="0"
+		<menu_item_call bottom="-465" enabled="false" height="19" label="Link" left="0"
 		     mouse_opaque="true" name="Link" shortcut="control|L" width="250">
 			<on_click function="Tools.Link" userdata="" />
 			<on_enable function="Tools.EnableLink" />
 		</menu_item_call>
-		<menu_item_call bottom="-281" enabled="false" height="19" label="Unlink" left="0"
+		<menu_item_call bottom="-484" enabled="false" height="19" label="Unlink" left="0"
 		     mouse_opaque="true" name="Unlink" shortcut="control|shift|L" width="250">
 			<on_click function="Tools.Unlink" userdata="" />
 			<on_enable function="Tools.EnableUnlink" />
 		</menu_item_call>
-		<menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_separator bottom="-492" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator4" width="250" />
 		<menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
 		     mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
 			<on_click function="Tools.LookAtSelection" userdata="focus" />
 			<on_enable function="Tools.SomethingSelectedNoHUD" />
 		</menu_item_call>
-		<menu_item_call bottom="-327" enabled="false" height="19" label="Zoom to Selection" left="0"
+		<menu_item_call bottom="-411" enabled="false" height="19" label="Zoom to Selection" left="0"
 		     mouse_opaque="true" name="Zoom to Selection" shortcut="shift|H" width="250">
 			<on_click function="Tools.LookAtSelection" userdata="zoom" />
 			<on_enable function="Tools.SomethingSelectedNoHUD" />
 		</menu_item_call>
-		<menu_item_call bottom="-346" enabled="false" height="19" label="Buy Object" left="0"
-		     mouse_opaque="true" name="Menu Object Take" visible="false" width="250">
-			<on_click function="Tools.BuyOrTake" userdata="" />
-			<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
-		</menu_item_call>
-		<menu_item_call bottom="-365" enabled="false" height="19" label="Take Copy" left="0"
-		     mouse_opaque="true" name="Take Copy" width="250">
-			<on_click function="Tools.TakeCopy" userdata="" />
-			<on_enable function="Tools.EnableTakeCopy" />
-		</menu_item_call>
-		<menu_item_call bottom="-384" enabled="false" height="19"
+		<menu_item_call bottom="-430" enabled="false" height="19"
 		     label="Save Object Back to My Inventory" left="0" mouse_opaque="true"
 		     name="Save Object Back to My Inventory" width="250">
 			<on_click function="Tools.SaveToInventory" userdata="" />
 			<on_enable function="Tools.EnableSaveToInventory" />
 		</menu_item_call>
-		<menu_item_call bottom="-403" enabled="false" height="19"
+		<menu_item_call bottom="-449" enabled="false" height="19"
 		     label="Save Object Back to Object Contents" left="0" mouse_opaque="true"
 		     name="Save Object Back to Object Contents" width="250">
 			<on_click function="Tools.SaveToObjectInventory" userdata="" />
 			<on_enable function="Tools.EnableSaveToObjectInventory" />
 		</menu_item_call>
-		<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator6" width="250" />
-		<menu_item_call bottom="-430" enabled="true" height="19"
-		     label="Show Script Warning/Error Window" left="0" mouse_opaque="true"
-		     name="Show Script Warning/Error Window" width="250">
-			<on_click function="ShowFloater" userdata="script errors" />
+	</menu>
+
+        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="317" label="Window" left="0" mouse_opaque="false" name="Window"
+	     opaque="true" tear_off="true" width="166">
+               <menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
+		     mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
+			<on_click function="View.Mouselook" userdata="" />
+			<on_enable function="View.EnableMouselook" />
 		</menu_item_call>
-		<menu_item_call bottom="-449" enabled="false" height="19"
-		     label="Recompile Scripts in Selection" left="0" mouse_opaque="true"
-		     name="Recompile Scripts in Selection" width="250">
-			<on_click function="Tools.SelectedScriptAction" userdata="compile" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-		<menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
-		     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
-			<on_click function="Tools.SelectedScriptAction" userdata="reset" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-		<menu_item_call bottom="-487" enabled="false" height="19"
-		     label="Set Scripts to Running in Selection" left="0" mouse_opaque="true"
-		     name="Set Scripts to Running in Selection" width="250">
-			<on_click function="Tools.SelectedScriptAction" userdata="start" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-		<menu_item_call bottom="-506" enabled="false" height="19"
-		     label="Set Scripts to Not Running in Selection" left="0"
-		     mouse_opaque="true" name="Set Scripts to Not Running in Selection"
-		     width="250">
-			<on_click function="Tools.SelectedScriptAction" userdata="stop" />
-			<on_enable function="EditableSelected" />
+               <menu_item_call bottom="-48" enabled="true" height="19" label="Reset View" left="0"
+		     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
+			<on_click function="View.ResetView" userdata="" />
 		</menu_item_call>
-	</menu>
+		<menu_item_separator bottom="-56" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator5" width="211" />
+		<menu_item_call bottom="-77" enabled="true" height="19" label="Zoom In" left="0"
+		     mouse_opaque="true" name="Zoom In" shortcut="control|0" width="211">
+			<on_click function="View.ZoomIn" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-96" enabled="true" height="19" label="Zoom Default" left="0"
+		     mouse_opaque="true" name="Zoom Default" shortcut="control|9" width="211">
+			<on_click function="View.ZoomDefault" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-115" enabled="true" height="19" label="Zoom Out" left="0"
+		     mouse_opaque="true" name="Zoom Out" shortcut="control|8" width="211">
+			<on_click function="View.ZoomOut" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-123" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator6" width="211" />
+		<menu_item_call bottom="-142" enabled="true" height="19" label="Toggle Fullscreen" left="0"
+		     mouse_opaque="true" name="Toggle Fullscreen" shortcut="alt|Enter"
+		     width="188">
+			<on_click function="View.Fullscreen" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-161" enabled="true" height="19" label="Set UI Size to Default" left="0"
+		     mouse_opaque="true" name="Set UI Size to Default" width="188">
+			<on_click function="View.DefaultUISize" userdata="" />
+		</menu_item_call>
+                <menu_item_separator bottom="-169" enabled="true" height="8" label="-----------" left="0"
+		     mouse_opaque="true" name="separator4" width="243" />
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="117" label="Set Window Size" left="0" mouse_opaque="false"
+		     name="Set Window Size" opaque="true" tear_off="true" width="125">
+			<menu_item_call bottom="-29" enabled="true" height="19" label="320x240" left="0"
+			     mouse_opaque="true" name="320x240" width="125">
+				<on_click function="File.SetWindowSize" userdata="320,240" />
+			</menu_item_call>
+			<menu_item_call bottom="-48" enabled="true" height="19" label="640x480" left="0"
+			     mouse_opaque="true" name="640x480" width="125">
+				<on_click function="File.SetWindowSize" userdata="640,480" />
+			</menu_item_call>
+			<menu_item_call bottom="-67" enabled="true" height="19" label="800x600" left="0"
+			     mouse_opaque="true" name="800x600" width="125">
+				<on_click function="File.SetWindowSize" userdata="800,600" />
+			</menu_item_call>
+			<menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="125" />
+			<menu_item_call bottom="-94" enabled="true" height="19" label="720x480 (NTSC)" left="0"
+			     mouse_opaque="true" name="720x480 (NTSC)" width="125">
+				<on_click function="File.SetWindowSize" userdata="720,480" />
+			</menu_item_call>
+			<menu_item_call bottom="-113" enabled="true" height="19" label="768x576 (PAL)" left="0"
+			     mouse_opaque="true" name="768x576 (PAL)" width="125">
+				<on_click function="File.SetWindowSize" userdata="768,576" />
+			</menu_item_call>
+		</menu>
+                <menu_item_separator bottom="-177" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="125" />
+                <menu_item_check bottom="-196" enabled="true" height="19" label="Show Toolbar" left="0"
+		     mouse_opaque="true" name="Toolbar" width="211">
+			<on_click function="ShowFloater" userdata="toolbar" />
+			<on_check function="FloaterVisible" userdata="toolbar" />
+		</menu_item_check>
+                <menu_item_check bottom="-116" enabled="true" height="19" label="Show HUD Attachments" left="0"
+		     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
+		     width="211">
+			<on_click function="View.ShowHUDAttachments" userdata="" />
+			<on_check function="View.CheckHUDAttachments" />
+		</menu_item_check>
+        </menu>
+        
 	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
 	     height="317" label="Help" left="227" mouse_opaque="false" name="Help"
 	     opaque="true" tear_off="true" width="166">
@@ -795,6 +795,29 @@
 		     mouse_opaque="true" name="Tutorial" width="166">
 			<on_click function="ShowFloater" userdata="help tutorial" />
 		</menu_item_call>
+		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+		     height="79" label="Hover Tips" left="0" mouse_opaque="false"
+		     name="Hover Tips" opaque="true" tear_off="true" width="158">
+			<menu_item_check bottom="-29" enabled="true" height="19" label="Show Tips" left="0"
+			     mouse_opaque="true" name="Show Tips" shortcut="control|shift|T" width="158">
+				<on_click function="View.ShowHoverTips" userdata="" />
+				<on_check function="View.CheckShowHoverTips" />
+			</menu_item_check>
+			<menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="158" />
+			<menu_item_check bottom="-56" enabled="true" height="19" label="Land Tips" left="0"
+			     mouse_opaque="true" name="Land Tips" width="158">
+				<on_click function="ToggleControl" userdata="ShowLandHoverTip" />
+				<on_enable function="View.CheckShowHoverTips" />
+				<on_check control="ShowLandHoverTip" />
+			</menu_item_check>
+			<menu_item_check bottom="-75" enabled="true" height="19" label="Tips On All Objects" left="0"
+			     mouse_opaque="true" name="Tips On All Objects" width="158">
+				<on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
+				<on_enable function="View.CheckShowHoverTips" />
+				<on_check control="ShowAllObjectHoverTip" />
+			</menu_item_check>
+		</menu>
 		<menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="166" />
 		<menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
@@ -819,14 +842,6 @@
 		     mouse_opaque="true" name="Report Abuse..." width="166">
 			<on_click function="ShowFloater" userdata="complaint reporter" />
 		</menu_item_call>
-		<menu_item_call bottom="-213" enabled="true" height="19" label="Bumps, Pushes &amp; Hits..."
-		     left="0" mouse_opaque="true" name="Bumps, Pushes &amp;amp; Hits..."
-		     width="166">
-			<on_click function="ShowFloater" userdata="mean events" />
-		</menu_item_call>
-		<menu_item_call label="Lag Meter" name="Lag Meter">
-			<on_click function="ShowFloater" userdata="lag meter" />
-		</menu_item_call>
 		<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator7" width="250" />
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
@@ -873,8 +888,6 @@
 		     mouse_opaque="true" name="Release Notes..." width="166">
 			<on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
 		</menu_item_call>
-		<menu_item_separator bottom="-294" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator6" width="166" />
 		<menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />