Merge from remote repo

79 files changed, 6597 insertions, 6120 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d0d0cc64c5..4bbd561882 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,5 +5,6 @@
  name="floater_aaa"
  can_resize="true" 
  width="1024">
+ <string name="Nudge Parabuild">2</string>
   <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 5c09bc3a02..69f9f6a2f8 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -49,22 +49,57 @@
          top="22"
          visible="false"
          width="78" />
-         <!--TODO: replace with slider, + - images -->
- <joystick_zoom
-         follows="top|left"
-         height="78"
-         image_unselected="ScrollThumb_Vert"
-         layout="topleft"
-         left="7"
-         minus_image="ScrollThumb_Vert"
-         name="zoom"
-         plus_image="ScrollThumb_Vert"
-         quadrant="left"
-         scale_image="false"
-         sound_flags="3"
-         tool_tip="Zoom camera toward focus"
-         top="22"
-         width="20" />
+         <!--TODO: replace + - images -->
+         <panel
+            border="false"
+            class="camera_zoom_panel"
+            height="94"
+            layout="topleft"
+            left="7"
+            mouse_opaque="false"
+            name="zoom"
+            top="22"
+            width="18">
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="AddItem_Disabled"
+              image_selected="AddItem_Press"
+              image_unselected="AddItem_Off"
+              layout="topleft"
+              name="zoom_plus_btn"
+              width="18">
+             <commit_callback
+                function="Zoom.plus" />
+             <mouse_held_callback
+                function="Zoom.plus" />
+           </button>
+           <slider_bar
+              height="48"
+              layout="topleft"
+              name="zoom_slider"
+              orientation="vertical"
+              tool_tip="Zoom camera toward focus"
+              top_pad="0"
+              width="18">
+             <commit_callback function="Slider.value_changed"/>
+           </slider_bar>
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="MinusItem_Disabled"
+              image_selected="MinusItem_Press"
+              image_unselected="MinusItem_Off"
+              layout="topleft"
+              name="zoom_minus_btn"
+              top_pad="0"
+              width="18">
+             <commit_callback
+                function="Zoom.minus" />
+             <mouse_held_callback
+                function="Zoom.minus" />
+           </button>
+         </panel>
          <joystick_rotate
          follows="top|left"
          height="78"
@@ -72,6 +107,7 @@
          image_unselected="Cam_Rotate_Out"
          layout="topleft"
          left="45"
+         mouse_opaque="false" 
          name="cam_rotate_stick"
          quadrant="left"
          scale_image="false"
@@ -80,7 +116,7 @@
          tool_tip="Orbit camera around focus"
          top="22"
          width="78" />
-            <panel
+         <panel
          height="78"
          layout="topleft"
          left="36"
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 6c4f10e61e..9d2a811d9f 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -3383,6 +3383,16 @@ scratch and wear it.
      bottom="536"
      follows="right|bottom"
      height="20"
+     label="Make Outfit"
+     label_selected="Make Outfit"
+     layout="topleft"
+     name="make_outfit_btn"
+     right="-216"
+     width="100" />
+    <button
+     bottom="536"
+     follows="right|bottom"
+     height="20"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index b23482655c..21d292847a 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -83,22 +83,35 @@
                  tool_tip="Make new gesture"
                  top_delta="0"
                  width="18" />
-                <button
+              <button
                  follows="bottom|left"
                  font="SansSerifBigBold"
+                 height="10"
+                 image_hover_selected="Activate_Checkmark"
+                 image_selected="Activate_Checkmark"
+                 image_unselected="Activate_Checkmark"
+                 layout="topleft"
+                 left_pad="5"
+                 name="activate_btn"
+                 tool_tip="Activate/Deactivate selected gesture"
+                 top="10"
+                 width="10" />
+              <button
+                 follows="bottom|right"
+                 font="SansSerifBigBold"
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
                  image_disabled="TrashItem_Disabled"
                  layout="topleft"
-                 left_pad="230"
                  name="del_btn"
+                 right="-5"
                  tool_tip="Delete this gesture"
                  top_delta="0"
                  width="18" />
             </panel>
     <button
-     follows="bottom|right"
+     follows="left|bottom"
      height="23"
      label="Edit"
      layout="topleft"
@@ -107,7 +120,7 @@
      top_pad="5"
      width="83" />
     <button
-     follows="bottom|right"
+     follows="left|bottom"
      height="23"
      label="Play"
      layout="topleft"
@@ -116,7 +129,7 @@
      top_delta="0"
      width="83" />
     <button
-     follows="bottom|right"
+     follows="left|bottom"
      height="23"
      label="Stop"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 452d28d4ea..c20aaea2aa 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,75 +2,77 @@
 <floater
  legacy_header_height="18"
  background_visible="true"
- follows="left|top|right|bottom"
- height="369"
+ follows="all"
+ height="350"
  layout="topleft"
  left="0"
  name="panel_im"
- help_topic="panel_im"
  top="0"
+ can_close="true"
  can_dock="true"
- can_minimize="true"
- visible="true" 
- width="520"
+ can_minimize="false"
+ visible="true"
+ width="300"
  can_resize="true"
- min_width="350"
- min_height="369">
-  <layout_stack follows="left|top|right|bottom"
-                height="354"
-                width="520"
-                layout="topleft"
-                orientation="horizontal"
-                name="im_panels"
-                top="16"
-                left="2">
+ min_width="300"
+ min_height="350">
+  <layout_stack
+  follows="all"
+  height="350"
+  width="300"
+  layout="topleft"
+  orientation="horizontal"
+  name="im_panels"
+  top="20"
+  left="0">
     <layout_panel
       name="panel_im_control_panel"
       layout="topleft"
-      top_delta="-3"
-      height="354"
       follows="left"
       label="IM Control Panel"
       auto_resize="false"
       user_resize="false" />
-    <layout_panel height="354"
-                  width="355"
-                  left_delta="146" 
-                  top="0"
-                  user_resize="false">
-      <button height="12"
-      		  follows="left|top"
-              top="8" 
-              label="&lt;&lt;"
-              layout="topleft"
-              width="35"
-              name="slide_left_btn" />
-      <button height="12"
-      		  follows="left|top"
-              top="8"
-              label="&gt;&gt;"
-              layout="topleft"
-              width="35"
-              name="slide_right_btn" />
-      <chat_history
-       length="1"
-       follows="left|top|right|bottom"
-       font="SansSerif"
-       height="300"
-       layout="topleft"
-       name="chat_history"
-       parse_highlights="true"
-       allow_html="true" 
-       width="350">
-      </chat_history>
-      <line_editor
-       follows="left|right"
-       height="20"
-       label="To"
-       layout="topleft"
-       name="chat_editor"
-       width="345">
-      </line_editor>
+    <layout_panel
+       left="0"
+       top="0"
+       user_resize="false">
+        <button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="2"
+          image_overlay="TabIcon_Open_Off"
+          layout="topleft"
+          width="25"
+          name="slide_left_btn" />
+         <button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="2"
+          image_overlay="TabIcon_Close_Off"
+          width="25"
+          name="slide_right_btn" />
+        <chat_history
+         length="1"
+	 font="SansSerifSmall"
+         follows="left|right|top"
+         height="280"
+         name="chat_history"
+         parse_highlights="true"
+         allow_html="true"
+        left="1"
+         width="180">
+        </chat_history>
+        <line_editor
+         follows="left|right|top"
+	 font="SansSerifSmall"
+         height="20"
+         label="To"
+         name="chat_editor"
+         top_pad="1"
+         width="180">
+        </line_editor>
     </layout_panel>
   </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 16873df310..526fda90d1 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -4,13 +4,17 @@
  can_close="false"
  can_minimize="false"
  can_tear_off="false"
- height="200"
+ height="125"
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
  title="UNKNOWN PERSON IS CALLING"
- width="240">
-     <floater.string
+ width="410">
+    <floater.string
+     name="localchat">
+        Nearby Voice Chat
+    </floater.string>
+    <floater.string
      name="anonymous">
         anonymous
     </floater.string>
@@ -31,18 +35,26 @@
      left_delta="19"
      top="35"
      width="36" />
-    <text_editor
-     font="SansSerif"
-     height="64"
-     border_visible="false"
+    <text
+     font="SansSerifLarge"
+     height="20"
      layout="topleft"
      left="77"
-     max_length="2147483647"
      name="caller name"
-     read_only="true"
-     top="21"
-     width="163"
+     top="27"
+     width="315"
      word_wrap="true" />
+    <text
+     font="SansSerif"
+     height="50"
+     layout="topleft"
+     left="77"
+     name="question"
+     top="52"
+     width="315"
+     word_wrap="true">
+     Do you want to leave [CURRENT_CHAT] and join this voice chat?
+    </text>
     <button
      height="24"
      label="Accept"
@@ -57,16 +69,14 @@
      label="Reject"
      label_selected="Reject"
      layout="topleft"
-     left_delta="0"
      name="Reject"
-     top_pad="12"
+     left_pad="10"
      width="100" />
     <button
      height="24"
      label="Start IM"
      layout="topleft"
-     left_delta="0"
      name="Start IM"
-     top_pad="12"
+     left_pad="10"
      width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index b48c962413..dca1692e4a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -30,13 +30,12 @@
      name="Fetched">
         Fetched
     </floater.string>
-<panel
+    <panel
      bottom="560"
 	 class="panel_main_inventory"
 	 filename="panel_main_inventory.xml"
 	 follows="all"
 	 layout="topleft"
-	 hide_top_panel="true"
 	 left="0"
 	 label="Inventory Panel"
 	 name="Inventory Panel"
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 2c04a94613..e3751f2bd9 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -42,7 +42,7 @@
     </scroll_list>
     <button
      height="23"
-     font="SansSerifBold"
+     font="SansSerif"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -53,7 +53,7 @@
      width="80" />
     <button
      height="23"
-     font="SansSerifBold"
+     font="SansSerif"
      label="Map"
      label_selected="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 7f58ea132e..d8534bfe0b 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
  can_tear_off="false"
- can_resize="false"
+ can_resize="true"
  can_drag_on_left="false"
- can_close="false"
+ can_close="true"
  can_dock="true"
  bevel_style="in"
  height="300"
  layout="topleft"
  name="nearby_chat"
- help_topic="nearby_chat"
  save_rect="true"
  title="NEARBY CHAT"
  save_dock_state="true"
@@ -19,19 +18,17 @@
  single_instance="true"
  width="320">
             <chat_history
-             allow_html="true" 
+             allow_html="true"
              bg_readonly_color="ChatHistoryBgColor"
              bg_writeable_color="ChatHistoryBgColor"
              follows="all"
-			 left="1"
+	    left="1"
              top="20"
-             font="SansSerif"
              layout="topleft"
-			 height="280"
+	    height="280"
              name="chat_history"
-             parse_highlights="true" 
+             parse_highlights="true"
              text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor"
-             width="320"/>
-
+             width="320" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
new file mode 100644
index 0000000000..ae4d5042ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_close="false"
+ can_minimize="false"
+ can_tear_off="false"
+ height="125"
+ layout="topleft"
+ name="outgoing call"
+ help_topic="outgoing_call"
+ title="CALLING"
+ width="410">
+    <floater.string
+     name="localchat">
+        Nearby Voice Chat
+    </floater.string>
+    <floater.string
+     name="anonymous">
+        anonymous
+    </floater.string>
+    <floater.string
+     name="VoiceInviteP2P">
+        is calling.
+    </floater.string>
+    <floater.string
+     name="VoiceInviteAdHoc">
+        has joined a Voice Chat call with a conference chat.
+    </floater.string>
+    <avatar_icon
+     enabled="false"
+     follows="left|top"
+     height="36"
+     image_name="icon_avatar_online.tga"
+     layout="topleft"
+     left_delta="19"
+     top="35"
+     width="36" />
+    <text
+     font="SansSerifLarge"
+     height="20"
+     layout="topleft"
+     left="77"
+     name="connecting"
+     top="27"
+     visible="false"
+     width="315"
+     word_wrap="true">
+Connecting to [CALLEE_NAME]
+    </text>
+    <text
+     font="SansSerifLarge"
+     height="20"
+     layout="topleft"
+     left="77"
+     name="calling"
+     top="27"
+     width="315"
+     word_wrap="true">
+Calling [CALLEE_NAME]
+    </text>
+    <text
+     font="SansSerifLarge"
+     height="20"
+     layout="topleft"
+     left="77"
+     name="noanswer"
+     top="27"
+     width="315"
+     word_wrap="true">
+No Answer.  Please try again later.
+    </text>
+    <text
+     font="SansSerif"
+     height="50"
+     layout="topleft"
+     left="77"
+     name="leaving"
+     top="52"
+     width="315"
+     word_wrap="true">
+Leaving [CURRENT_CHAT].
+    </text>
+    <button
+     height="24"
+     label="Cancel"
+     label_selected="Cancel"
+     left="70"
+     layout="topleft"
+     name="Cancel"
+     left_pad="10"
+     width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 6faab84159..4909b8988f 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -22,10 +22,10 @@
          height="16"
          label="Share with group"
          layout="topleft"
-         left_delta="-250"
+         left="10"
          name="share_with_group"
-         top_delta="2"
-         width="106" />
+         top="5"
+         width="150" />
         <check_box
          control_name="EveryoneCopy"
          height="16"
@@ -33,8 +33,8 @@
          layout="topleft"
          left_delta="0"
          name="everyone_copy"
-         top_pad="16"
-         width="130" />
+         top_pad="5"
+         width="150" />
         <text
          type="string"
          length="1"
@@ -43,8 +43,8 @@
          layout="topleft"
          left_delta="0"
          name="NextOwnerLabel"
-         top_pad="16"
-         width="88">
+         top_pad="5"
+         width="150">
             Next owner can:
         </text>
         <check_box
@@ -54,17 +54,17 @@
          layout="topleft"
          left_delta="0"
          name="next_owner_modify"
-         top_pad="14"
-         width="78" />
+         top_pad="5"
+         width="150" />
         <check_box
          control_name="NextOwnerCopy"
          height="16"
          label="Copy"
          layout="topleft"
-         left_delta="78"
+         left_delta="0"
          name="next_owner_copy"
-         top_delta="0"
-         width="88" >
+         top_pad="5"
+         width="150" >
 		    <check_box.commit_callback
 			function="Perms.Copy" />
 		</check_box>
@@ -76,10 +76,10 @@
          initial_value="true"
          label="Resell/Give away"
          layout="topleft"
-         left_delta="88"
+         left_delta="0"
          name="next_owner_transfer"
-         top_delta="0"
-         width="106" />
+         top_pad="5"
+         width="150" />
     </panel>
     <button
      height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 68a4867167..f9dacf0207 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -405,179 +405,179 @@
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
+		  </stat_view>
 
-			  <stat_bar
-				 name="simagentups"
-				 label="Agent Updates/Sec"
-				 stat="simagentups"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="100.f" 
-				 tick_spacing="25.f"
-				 label_spacing="50.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simagentups"
+			   label="Agent Updates/Sec"
+			   stat="simagentups"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simmainagents"
-				 label="Main Agents"
-				 stat="simmainagents"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="80.f" 
-				 tick_spacing="10.f"
-				 label_spacing="40.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simmainagents"
+			   label="Main Agents"
+			   stat="simmainagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="80.f" 
+			   tick_spacing="10.f"
+			   label_spacing="40.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simchildagents"
-				 label="Child Agents"
-				 stat="simchildagents"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="5.f"
-				 label_spacing="10.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simchildagents"
+			   label="Child Agents"
+			   stat="simchildagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="40.f" 
+			   tick_spacing="5.f"
+			   label_spacing="10.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simobjects"
-				 label="Objects"
-				 stat="simobjects"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="30000.f" 
-				 tick_spacing="5000.f"
-				 label_spacing="10000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simobjects"
+			   label="Objects"
+			   stat="simobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="30000.f" 
+			   tick_spacing="5000.f"
+			   label_spacing="10000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simactiveobjects"
-				 label="Active Objects"
-				 stat="simactiveobjects"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simactiveobjects"
+			   label="Active Objects"
+			   stat="simactiveobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simactivescripts"
-				 label="Active Scripts"
-				 stat="simactivescripts"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simactivescripts"
+			   label="Active Scripts"
+			   stat="simactivescripts"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simscripteps"
-				 label="Script Events"
-				 stat="simscripteps"
-				 unit_label="eps"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="20000.f" 
-				 tick_spacing="2500.f"
-				 label_spacing="5000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simscripteps"
+			   label="Script Events"
+			   stat="simscripteps"
+			   unit_label="eps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="20000.f" 
+			   tick_spacing="2500.f"
+			   label_spacing="5000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="siminpps"
-				 label="Packets In"
-				 stat="siminpps"
-				 unit_label="pps"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="2000.f" 
-				 tick_spacing="250.f"
-				 label_spacing="1000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="siminpps"
+			   label="Packets In"
+			   stat="siminpps"
+			   unit_label="pps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simoutpps"
-				 label="Packets Out"
-				 stat="simoutpps"
-				 unit_label="pps" 
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="2000.f" 
-				 tick_spacing="250.f"
-				 label_spacing="1000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simoutpps"
+			   label="Packets Out"
+			   stat="simoutpps"
+			   unit_label="pps" 
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simpendingdownloads"
-				 label="Pending Downloads"
-				 stat="simpendingdownloads"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simpendingdownloads"
+			   label="Pending Downloads"
+			   stat="simpendingdownloads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simpendinguploads"
-				 label="Pending Uploads"
-				 stat="simpendinguploads"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="100.f" 
-				 tick_spacing="25.f"
-				 label_spacing="50.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simpendinguploads"
+			   label="Pending Uploads"
+			   stat="simpendinguploads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simtotalunackedbytes"
-				 label="Total Unacked Bytes"
-				 stat="simtotalunackedbytes"
-				 unit_label="kb"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="100000.f" 
-				 tick_spacing="25000.f"
-				 label_spacing="50000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-			</stat_view>
+			<stat_bar
+			   name="simtotalunackedbytes"
+			   label="Total Unacked Bytes"
+			   stat="simtotalunackedbytes"
+			   unit_label="kb"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="100000.f" 
+			   tick_spacing="25000.f"
+			   label_spacing="50000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
 			<stat_view
 			   name="simperf"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index e1f07a49e7..be6d63716c 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -15,7 +15,7 @@
  height="23"
  can_minimize="true"
  can_tear_off="false"
- can_resize="false"
+ can_resize="true"
  can_drag_on_left="false"
  can_close="false"
  can_dock="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index e017d404c6..0531b52e5a 100644
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
@@ -18,7 +18,18 @@
     Enabled line editor
   </line_editor>
   <line_editor
-    enabled="false"
+   height="20"
+   layout="topleft"
+   left_delta="0"
+   name="ascii_line_editor"
+   prevalidate_callback="ascii"
+   tool_tip="ascii line editor"
+   top_pad="10" 
+   width="200">
+    ASCII only line editor
+  </line_editor>
+  <line_editor
+   enabled="false"
    height="20"
    layout="topleft"
    left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
index 57d8e686ce..86ff82e01f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_slider.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml
@@ -57,6 +57,13 @@
      width="200" />
     <slider_bar
      bottom="320"
+     height="100"
+     left="20"
+     name="slider_bar_vertical"
+     orientation="vertical"
+     width="20" />
+    <slider_bar
+     bottom="300"
      height="20"
      increment="1"
      initial_value="2.0"
@@ -64,6 +71,7 @@
      layout="topleft"
      max_val="5"
      min_val="1"
+     left_pad="20"
      name="slider_bar"
      width="300" />
     <slider
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c33d7cf31d..a626e1b353 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -262,6 +262,19 @@
 		  <check_box.commit_callback
 			function="BuildTool.selectComponent"/>
 	</check_box>
+
+   <text
+   text_color="LtGray_50"
+   follows="top|left"
+   halign="left"
+   left="13"
+   name="RenderingCost"
+   tool_tip="Shows the rendering cost calculated for this object"
+   top_pad="9"
+   type="string"
+   width="100">
+   þ: [COUNT]
+   </text>
 	<check_box
      control_name="ScaleUniform"
      height="19"
@@ -294,6 +307,7 @@
      layout="topleft"
      follows="left|top"
      name="combobox grid mode"
+     tool_tip="Choose the type of grid ruler for positioning the object"
      width="108">
         <combo_box.item
          label="World grid"
@@ -317,7 +331,7 @@
      image_unselected="ForwardArrow_Off"
      layout="topleft"
      name="Options..."
-     tool_tip="Grid options"
+     tool_tip="See more grid options"
      top_delta="0"
      right="-10"
      width="18"
@@ -325,7 +339,7 @@
 	 <button.commit_callback
 	     function="BuildTool.gridOptions"/>
 	</button>
-    <button
+   <button
      follows="left|top"
      height="20"
      image_disabled="Object_Cube"
@@ -701,6 +715,7 @@
 	     function="BuildTool.applyToSelection"/>
     </button>
     <text
+    text_color="LtGray_50"
      type="string"
      length="1"
      height="12"
@@ -714,6 +729,7 @@
         Objects: [COUNT]
     </text>
     <text
+    text_color="LtGray_50"
      type="string"
      length="1"
      follows="left|top"
@@ -730,7 +746,7 @@
      halign="center"
      left="0"
      name="Object Info Tabs"
-     tab_max_width="55"
+     tab_max_width="54"
      tab_min_width="40"
      tab_position="top"
      tab_height="25"
@@ -772,7 +788,7 @@
             </panel.string>
             <panel.string
              name="text modify warning">
-                This object has linked parts
+                You must select entire object to set permissions
             </panel.string>
             <panel.string
              name="Cost Default">
@@ -795,11 +811,8 @@
                 Mixed Sale
             </panel.string>
             <text
-             type="string"
-             length="1"
              follows="left|top"
              height="10"
-             layout="topleft"
              left="10"
              name="Name:"
              top="0"
@@ -809,7 +822,6 @@
             <line_editor
              follows="left|top|right"
              height="19"
-             layout="topleft"
              left_pad="0"
              max_length="63"
              name="Object Name"
@@ -817,11 +829,8 @@
              top_delta="0"
              width="170" />
             <text
-             type="string"
-             length="1"
              follows="left|top"
              height="10"
-             layout="topleft"
              left="10"
              name="Description:"
              top_pad="3"
@@ -831,7 +840,6 @@
             <line_editor
              follows="left|top|right"
              height="19"
-             layout="topleft"
              left_pad="0"
              max_length="127"
              name="Object Description"
@@ -1060,7 +1068,7 @@ even though the user gets a free copy.
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="250">
+             width="264">
                 You can modify this object
             </text>
             <text
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 4e2cce1428..1adb824e2a 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -53,22 +53,6 @@
         Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
 you must accept the agreement.
     </text>
-    <text_editor
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="283"
-     layout="topleft"
-     left_delta="0"
-     max_length="65536"
-     name="tos_text"
-     top_pad="43"
-     width="568"
-     handle_edit_keys_directly="true" 
-     word_wrap="true">
-        TOS_TEXT
-    </text_editor>
     <web_browser
      follows="left|top"
      height="340"
@@ -76,6 +60,6 @@ you must accept the agreement.
      left_delta="0"
      name="tos_html"
      start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-     top_delta="-27"
+     top_delta="0"
      width="568" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 387ffbd5b3..c60cc163c8 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -340,6 +340,8 @@
          label="Landmarks"
          name="item1"
          value="None" />
+		<combo_box.commit_callback
+		function="WMap.Landmark"/>
     </combo_box>
     <icon
      color="0.5 0 0 1"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2c1e2b6dc0..dd3cf079db 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -4,18 +4,18 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater
- legacy_header_height="18"
+ legacy_header_height="25"
  bevel_style="in"
- bg_opaque_image="Inspector_Background" 
+ bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="138"
+ height="148"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="245">
+ width="228">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -30,7 +30,7 @@
   </string>
   <string
      name="Details">
-[ACCTTYPE][COMMA] [PAYMENTINFO]
+[SL_PROFILE]
     </string>
   <string
      name="Partner">
@@ -38,45 +38,45 @@
   </string>
   <text
      follows="all"
-     font="SansSerifLargeBold"
-     height="18"
+     font="SansSerifLarge"
+     height="16"
      left="8"
      name="user_name"
-     top="5"
-     text_color="white"
+     top="10"
+     text_color="White"
      use_ellipses="true"
      value="Grumpity ProductEngine"
-     width="240"
-     word_wrap="false" />
+     width="175" />
     <text
      follows="all"
      height="16"
      left="8"
-     value="Grumpity ProductEngine moose moose"
-     name="user_details"
-     top_pad="0"
-     width="170"
-     use_ellipses="true"
-     word_wrap="false" />
-    <text
-     follows="all"
-   font="SansSerifSmallBold"
+     name="user_subtitle"
+   font="SansSerifSmall"
    text_color="White"
-   height="18"
+     value="11 Months, 3 days old"
+     width="175"
+     use_ellipses="true" />
+     <text
+     follows="all"
+   height="25"
    left="8"
-     name="user_subtitle"
-     use_ellipses="true"
-     top_pad="0"
-     width="170" />
+     name="user_details"
+     word_wrap="true"
+     top_pad="6"
+     width="220">This is my second life description and I really think it is great.
+    </text>
     <text
      follows="all"
-     height="16"
+     height="13"
      left="8"
      name="user_partner"
-     top_pad="8"
-     width="240"
+     top_pad="3"
+     width="220"
      use_ellipses="true"
-     word_wrap="false" />
+     word_wrap="false">
+    Erica Linden
+  </text>
     <slider
      follows="top|left"
      height="23"
@@ -89,15 +89,15 @@
      tool_tip="Voice volume"
      top_pad="0"
      value="0.5"
-     width="150" />
+     width="195" />
     <button
      follows="all"
      height="16"
-     image_disabled="Inv_Sound"
-     image_disabled_selected="Inv_Sound"
-     image_hover_selected="Inv_Sound"
-     image_selected="Inv_Sound"
-     image_unselected="Inv_Sound"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="0"
      top_delta="4"
@@ -106,67 +106,60 @@
     <avatar_icon
      follows="all"
      height="38"
-     right="-25"
+     right="-10"
      bevel_style="in"
      border_style="line"
      mouse_opaque="true"
      name="avatar_icon"
-     top="24"
+     top="10"
      width="38" />
-    <button
-     follows="top|left"
-     height="18"
-     image_disabled="ForwardArrow_Disabled"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
-     layout="topleft"
-     name="view_profile_btn"
-     right="-8"
-     top="35"
-     left_delta="110"
-     tab_stop="false"
-     width="18" />
   <!-- Overlapping buttons for default actions
     llinspectavatar.cpp makes visible the most likely default action -->
     <button
      follows="bottom|left"
-     height="23"
+     height="20"
      label="Add Friend"
      left="8"
-     top="246"
+     top="119"
      name="add_friend_btn"
-     width="100" />
+     width="90" />
     <button
      follows="bottom|left"
-     height="23"
+     height="20"
      label="IM"
      left_delta="0"
      top_delta="0"
      name="im_btn"
-     width="100"
+     width="80"
      commit_callback.function="InspectAvatar.IM"
      />
-    <menu_button
+          <button
      follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
+     height="20"
+     label="More"
+     layout="topleft"
+     name="view_profile_btn"
+     left_delta="96"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+      <!--  gear buttons here -->
+     <menu_button
+     height="20"
+     layout="topleft"
+     image_overlay="OptionsMenu_Off"
      menu_filename="menu_inspect_avatar_gear.xml"
      name="gear_btn"
-     right="-10"
-     top="249"
-     width="18" />
-  <menu_button
-     visible="false" 
+     right="-5"
+     top_delta="0"
+     width="35" />
+         <menu_button
      follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
+     height="20"
+     image_overlay="OptionsMenu_Off"
      menu_filename="menu_inspect_self_gear.xml"
      name="gear_self_btn"
-     right="-10"
-     top="249"
-     width="18" />
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index e5e5007c56..f48af2f97e 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -31,7 +31,7 @@
      use_ellipses="true"
      width="240"
      word_wrap="false">
-    Grumpity's Grumpy Group of Moose
+    Grumpity&apos;s Grumpy Group of Moose
   </text>
   <text
    follows="all"
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 1365a0483f..16f6e49092 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -4,81 +4,81 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater
- legacy_header_height="18"
+ legacy_header_height="25"
  bevel_style="in"
- bg_opaque_image="Inspector_Background" 
+ bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="145"
+ height="148"
  layout="topleft"
  name="inspect_object"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="300">
+ width="228">
   <string name="Creator">By [CREATOR]</string>
   <string name="CreatorAndOwner">
 by [CREATOR]
 owner [OWNER]
   </string>
-  <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" -->
   <string name="Price">L$[AMOUNT]</string>
   <string name="PriceFree">Free!</string>
   <string name="Touch">Touch</string>
   <string name="Sit">Sit</string>
   <text
      follows="all"
-     font="SansSerifLargeBold"
+     font="SansSerifLarge"
      height="16"
      left="8"
      name="object_name"
      text_color="White"
-     top="5"
+     top="10"
      use_ellipses="true"
      value="Test Object Name That Is Really Long"
-     width="291" />
+     width="220" />
   <text
    follows="all"
-   font="SansSerif"
-   height="30"
+   height="33"
    left="8"
    name="object_creator"
    top_pad="0"
    use_ellipses="true"
-   width="275">
-by Longavatarname Johnsonlongstonnammer
-owner James Linden
+   width="220">
+    by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
   </text>
   <!-- *TODO: Replace this icon -->
   <icon
   name="price_icon"
   image_name="Icon_For_Sale"
-  left="7"
+  right="-5"
   width="16"
   height="16"
-  top="52"
+  top="56"
   follows="left|top"
   />
   <text
    follows="all"
-   font="SansSerifSmallBold"
+   font="SansSerifSmall"
+   font.style="BOLD"
    height="16"
-   left_pad="5"
+   halign="right"
+   left="5"
    name="price_text"
    text_color="white"
-   top="54"
+   top="58"
    font_shadow="none"
-   width="150">
+   width="196">
 L$300,000
   </text>
    <text
    follows="all"
-   height="30"
+   font="SansSerifSmall"
+   height="36"
    left="8"
    name="object_description"
    top_pad="0"
-   width="291"
-   use_ellipses="true"
+   width="220"
    word_wrap="true">
 This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
   </text>
@@ -86,69 +86,64 @@ This is a really long description for an object being as how it is at least 80 c
   for sale, "Sit" if can sit, etc. -->
    <text
    follows="all"
-   height="15"
+   font="SansSerifSmall"
+   height="13"
    left_delta="0"
    name="object_media_url"
-   top_pad="-5"
+   top_pad="0"
    width="291"
-   max_length = "50" 
-   use_ellipses="true"
-   word_wrap="true"/>   
-    
+   max_length = "50"
+   use_ellipses="true">
+   http://www.superdupertest.com
+</text>
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Buy"
-   left="10"
+   left="8"
    name="buy_btn"
-   top="114"
-   width="75" />
+   top="119"
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Pay"
    left_delta="0"
    name="pay_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
-   height="23"
+   height="20"
    label="Take Copy"
    left_delta="0"
    name="take_free_copy_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerifSmall"
    height="20"
    label="Touch"
    left_delta="0"
    name="touch_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
-   height="23"
+   height="20"
    label="Sit"
    left_delta="0"
    name="sit_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerifSmall"
    height="20"
    label="Open"
    left_delta="0"
    name="open_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <icon
    name="secure_browsing"
    image_name="Lock"
@@ -156,33 +151,28 @@ This is a really long description for an object being as how it is at least 80 c
    visible="false"
    width="18"
    height="18"
-   top_delta="2"
+   top_delta="0"
    tool_tip="Secure Browsing"
-   follows="left|top"/> 
-   
+   follows="left|top" />
+
  <!--  non-overlapping buttons here -->
-    <menu_button
-     follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
-     menu_filename="menu_inspect_object_gear.xml"
-     name="gear_btn"
-     right="-10"
-     top_delta="5"
-     width="18" />
-   <button
+     <button
      follows="top|left"
-     height="18"
-     image_disabled="ForwardArrow_Disabled"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
+     height="20"
+     label="More"
      layout="topleft"
      name="more_info_btn"
-     right="-5"
-     top="20"
-     left_delta="110"
+     left_delta="10"
+     top_delta="0"
      tab_stop="false"
-     width="18" />
+     width="80" />
+         <menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_object_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 08f7ee456e..14a4949df7 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -10,7 +10,7 @@
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="772"
+                height="768"
                 name="menu_stack"
                 orientation="vertical"
                 top="0">
@@ -51,6 +51,13 @@
                name="main_view"
                user_resize="true"
                width="500">
+          <view bottom="500"
+                follows="all"
+                height="500"
+                left="0"
+                mouse_opaque="false"
+                name="world_view_rect"
+                width="500"/>
           <layout_stack border_size="0"
                         bottom="500"
                         follows="all"
@@ -66,13 +73,6 @@
                    mouse_opaque="false"
                    name="hud container"
                    width="500">
-              <view bottom="500"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="world_view_rect"
-                    width="500"/>
               <panel follows="right|top|bottom"
                      height="500"
                      mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
index 542e319792..8cbe62cfb0 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
@@ -9,7 +9,15 @@
  visible="false"
  width="128">
     <menu_item_call
-     label="Chat..."
+     label="Group Info"
+     layout="topleft"
+     name="Show Profile">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="info" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show Session"
      layout="topleft"
      name="Chat">
         <menu_item_call.on_click
@@ -17,11 +25,11 @@
          parameter="group chat" />
     </menu_item_call>
     <menu_item_call
-     label="Info..."
+     label="End Session"
      layout="topleft"
-     name="Show Profile">
+     name="End Session">
         <menu_item_call.on_click
          function="IMChicletMenu.Action"
-         parameter="info" />
+         parameter="end" />
     </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
index c205868429..6891aaca32 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_call
-     label="Show Profile..."
+     label="Show Profile"
      layout="topleft"
      name="Show Profile">
         <menu_item_call.on_click
@@ -17,7 +17,15 @@
          parameter="profile" />
     </menu_item_call>
     <menu_item_call
-     label="Send IM..."
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show Session"
      layout="topleft"
      name="Send IM">
         <menu_item_call.on_click
@@ -25,11 +33,11 @@
          parameter="im" />
     </menu_item_call>
     <menu_item_call
-     label="Add Friend..."
+     label="End Session"
      layout="topleft"
-     name="Add Friend">
+     name="End Session">
         <menu_item_call.on_click
          function="IMChicletMenu.Action"
-         parameter="add" />
+         parameter="end" />
     </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 590621062c..ef0bf72058 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -1,103 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>

-<menu

-         create_jump_keys="true"

-         layout="topleft"

-         mouse_opaque="false"

-         visible="false"

-         name="Gear Menu">

-  <menu_item_call

-   label="View Profile"

-   enabled="true" 

-   name="view_profile">

-    <menu_item_call.on_click

-     function="InspectAvatar.ViewProfile"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Add Friend"

-   name="add_friend">

-    <menu_item_call.on_click

-     function="InspectAvatar.AddFriend"/>

-  </menu_item_call>

-  <menu_item_call

-   label="IM"

-   name="im">

-    <menu_item_call.on_click

-     function="InspectAvatar.IM"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Call"

-   enabled="true"

-   name="call">

-  </menu_item_call>

-  <menu_item_call

-   label="Teleport"

-   name="teleport">

-    <menu_item_call.on_click

-     function="InspectAvatar.Teleport"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Invite to Group"

-   name="invite_to_group">

-    <menu_item_call.on_click

-     function="InspectAvatar.InviteToGroup"/>

-  </menu_item_call>

-  <menu_item_separator />

-  <menu_item_call

-   label="Block"

-   name="block">

-    <menu_item_call.on_click

-     function="InspectAvatar.Block"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Report"

-   name="report">

-    <menu_item_call.on_click

-     function="InspectAvatar.Report"/>

-  </menu_item_call>  

-  <menu_item_call

-   label="Freeze"

-   name="freeze">

-    <menu_item_call.on_click

-     function="InspectAvatar.Freeze"/>

-    <menu_item_call.on_visible

-     function="InspectAvatar.VisibleFreezeEject"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Eject"

-   name="eject">

-    <menu_item_call.on_click

-     function="InspectAvatar.Eject"/>

-    <menu_item_call.on_visible

-     function="InspectAvatar.VisibleFreezeEject"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Debug"

-   name="debug">

-    <menu_item_call.on_click

-     function="Avatar.Debug"/>

-    <menu_item_call.on_visible

-     function="IsGodCustomerService"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Find On Map"

-   name="find_on_map">

-    <menu_item_call.on_click

-     function="InspectAvatar.FindOnMap"/>

-    <menu_item_call.on_visible

-     function="InspectAvatar.VisibleFindOnMap"/>

-  </menu_item_call>

-  <menu_item_call

-   label="Zoom In"

-   name="zoom_in">

-    <menu_item_call.on_click

-     function="InspectAvatar.ZoomIn"/>

-    <menu_item_call.on_visible

-     function="InspectAvatar.VisibleZoomIn"/>

-  </menu_item_call>  

-  <menu_item_call

-   label="Pay"

-   name="pay">

-    <menu_item_call.on_click

-     function="InspectAvatar.Pay"/>

-  </menu_item_call>

-</menu>

+<?xml version="1.0" encoding="utf-8"?>
+<menu
+         create_jump_keys="true"
+         layout="topleft"
+         mouse_opaque="false"
+         visible="false"
+         name="Gear Menu">
+  <menu_item_call
+   label="View Profile"
+   enabled="true" 
+   name="view_profile">
+    <menu_item_call.on_click
+     function="InspectAvatar.ViewProfile"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Add Friend"
+   name="add_friend">
+    <menu_item_call.on_click
+     function="InspectAvatar.AddFriend"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.Enable"/>
+  </menu_item_call>
+  <menu_item_call
+   label="IM"
+   name="im">
+    <menu_item_call.on_click
+     function="InspectAvatar.IM"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Call"
+   enabled="true"
+   name="call">
+  </menu_item_call>
+  <menu_item_call
+   label="Teleport"
+   name="teleport">
+    <menu_item_call.on_click
+     function="InspectAvatar.Teleport"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Invite to Group"
+   name="invite_to_group">
+    <menu_item_call.on_click
+     function="InspectAvatar.InviteToGroup"/>
+  </menu_item_call>
+  <menu_item_separator />
+  <menu_item_call
+   label="Block"
+   name="block">
+    <menu_item_call.on_click
+     function="InspectAvatar.Block"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Report"
+   name="report">
+    <menu_item_call.on_click
+     function="InspectAvatar.Report"/>
+  </menu_item_call>  
+  <menu_item_call
+   label="Freeze"
+   name="freeze">
+    <menu_item_call.on_click
+     function="InspectAvatar.Freeze"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleFreezeEject"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Eject"
+   name="eject">
+    <menu_item_call.on_click
+     function="InspectAvatar.Eject"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleFreezeEject"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Debug"
+   name="debug">
+    <menu_item_call.on_click
+     function="Avatar.Debug"/>
+    <menu_item_call.on_visible
+     function="IsGodCustomerService"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Find On Map"
+   name="find_on_map">
+    <menu_item_call.on_click
+     function="InspectAvatar.FindOnMap"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleFindOnMap"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Zoom In"
+   name="zoom_in">
+    <menu_item_call.on_click
+     function="InspectAvatar.ZoomIn"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleZoomIn"/>
+  </menu_item_call>  
+  <menu_item_call
+   label="Pay"
+   name="pay">
+    <menu_item_call.on_click
+     function="InspectAvatar.Pay"/>
+  </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 8b6ab4e4d8..b65a49eaed 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -356,9 +356,9 @@
          parameter="restore" />
     </menu_item_call>
     <menu_item_call
-     label="Goto Link"
+     label="Find Original"
      layout="topleft"
-     name="Goto Link">
+     name="Find Original">
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
          parameter="goto" />
@@ -434,9 +434,9 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Take Off Items"
+     label="Remove From Outfit"
      layout="topleft"
-     name="Take Off Items">
+     name="Remove From Outfit">
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
          parameter="removefromoutfit" />
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index bd60574a95..07940e18b6 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -193,6 +193,13 @@
              function="ShowFloater"
              parameter="test_widgets" />
         </menu_item_call>
+        <menu_item_call
+         label="Inspectors Test"
+         name="Inspectors Test">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="test_inspectors" />
+        </menu_item_call>
       <menu_item_check
          label="Reg In Client Test (restart)"
          name="Reg In Client Test (restart)">
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index 5cbbd71bfe..8d0edf018d 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -10,7 +10,6 @@
  width="128">
     <menu_item_call
      label="Zoom Close"
-     layout="topleft"
      name="Zoom Close">
         <menu_item_call.on_click
          function="Minimap.Zoom"
@@ -18,7 +17,6 @@
     </menu_item_call>
     <menu_item_call
      label="Zoom Medium"
-     layout="topleft"
      name="Zoom Medium">
         <menu_item_call.on_click
          function="Minimap.Zoom"
@@ -26,29 +24,31 @@
     </menu_item_call>
     <menu_item_call
      label="Zoom Far"
-     layout="topleft"
      name="Zoom Far">
         <menu_item_call.on_click
          function="Minimap.Zoom"
          parameter="far" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Tracking Separator" />
+    <menu_item_check
+       label="Rotate Map"
+       name="Rotate Map">
+          <menu_item_check.on_check
+             control="MiniMapRotate" />
+          <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="MiniMapRotate" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_call
      label="Stop Tracking"
-     layout="topleft"
      name="Stop Tracking">
         <menu_item_call.on_click
          function="Minimap.Tracker"
          parameter="task_properties" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Tracking Separator" />
+    <menu_item_separator />
     <menu_item_call
      label="World Map"
-     layout="topleft"
      name="World Map">
         <menu_item_call.on_click
          function="ShowFloater"
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index 6dd44255bf..304492bedb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -13,15 +13,11 @@
        function="CheckControl"
        parameter="GroupListShowIcons" />
   </menu_item_check>
-  <menu_item_check
+  <menu_item_call
    label="Leave Selected Group"
    layout="topleft"
    name="Leave Selected Group">
-      <menu_item_check.on_click
-       function="People.Groups.ViewSort.Action"
-       parameter="show_icons" />
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="GroupListShowIcons" />
-  </menu_item_check>
+      <menu_item_call.on_click
+       function="People.Group.Minus.Action"/>
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
new file mode 100644
index 0000000000..7b52fecef7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="50"
+ layout="topleft"
+ mouse_opaque="false"
+ name="profile_overflow_menu"
+ width="120">
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="pay">
+        <menu_item_call.on_click
+         function="Profile.Pay" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e98a6d57bb..8ab5fb1659 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1,3698 +1,3709 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<menu_bar

- bg_visible="false"

- follows="left|top|right"

- layout="topleft"

- name="Main Menu">

-    <menu

-     label="Me"

-     layout="topleft"

-     name="Me"

-     tear_off="true">

-        <menu_item_call

-         label="Preferences"

-         layout="topleft"

-         name="Preferences"

-         shortcut="control|P">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="preferences" />

-        </menu_item_call>

-         <menu_item_call

-             label="My Dashboard"

-             layout="topleft"

-             name="Manage My Account">

-                <menu_item_call.on_click

-                 function="PromptShowURL"

-                 name="ManageMyAccount_url"

-                 parameter="WebLaunchJoinNow,http://secondlife.com/account/" />

-      </menu_item_call>

-        <menu_item_call

-         label="Buy L$"

-         layout="topleft"

-         name="Buy and Sell L$">

-            <menu_item_call.on_click

-             function="ShowFloater"

-             parameter="buy currency" />

-        </menu_item_call>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_call

-         label="My Profile"

-         layout="topleft"

-         name="Profile">

-            <menu_item_call.on_click

-             function="ShowAgentProfile"

-             parameter="agent" />

-        </menu_item_call>

-        <menu_item_call

-         label="My Appearance"

-         layout="topleft"

-         name="Appearance">

-            <menu_item_call.on_click

-             function="ShowFloater"

-             parameter="appearance" />

-            <menu_item_call.on_enable

-             function="Edit.EnableCustomizeAvatar" />

-        </menu_item_call>

-        <menu_item_check

-         label="My Inventory"

-         layout="topleft"

-         name="Inventory"

-         shortcut="control|I">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="inventory" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="inventory" />

-        </menu_item_check>

-        <menu_item_call

-         label="My Gestures"

-         layout="topleft"

-         name="Gestures"

-         shortcut="control|G">

-            <menu_item_call.on_click

-             function="ShowFloater"

-             parameter="gestures" />

-        </menu_item_call>

-        <menu

-         label="My Status"

-         layout="topleft"

-         name="Status"

-         tear_off="true">

-            <menu_item_call

-             label="Away"

-             layout="topleft"

-             name="Set Away">

-                <menu_item_call.on_click

-                 function="World.SetAway" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft"/>

-            <menu_item_call

-             label="Busy"

-             layout="topleft"

-             name="Set Busy">

-                <menu_item_call.on_click

-                 function="World.SetBusy"/>

-            </menu_item_call>

-        </menu>

-        <menu_item_call

-         label="Request Admin Status"

-         layout="topleft"

-         name="Request Admin Options"

-         shortcut="control|alt|G"

-		 visible="false">

-            <menu_item_call.on_click

-             function="Advanced.RequestAdminStatus" />

-        </menu_item_call>

-        <menu_item_call

-         label="Leave Admin Status"

-         layout="topleft"

-         name="Leave Admin Options"

-         shortcut="control|alt|shift|G"

-		 visible="false">

-            <menu_item_call.on_click

-             function="Advanced.LeaveAdminStatus" />

-        </menu_item_call>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_call

-         label="Quit [APP_NAME]"

-         layout="topleft"

-         name="Quit"

-         shortcut="control|Q">

-            <menu_item_call.on_click

-             function="File.Quit" />

-        </menu_item_call>

-    </menu>

-    <menu

-     label="Communicate"

-     layout="topleft"

-     name="Communicate"

-     tear_off="true">

-        <menu_item_call

-         label="My Friends"

-         layout="topleft"

-         name="My Friends"

-         shortcut="control|shift|F">

-            <menu_item_call.on_click

-             function="SideTray.PanelPeopleTab"

-             parameter="friends_panel" />

-            </menu_item_call>

-        <menu_item_call

-         label="My Groups"

-         layout="topleft"

-         name="My Groups">

-            <menu_item_call.on_click

-             function="SideTray.PanelPeopleTab"

-             parameter="groups_panel" />

-        </menu_item_call>

-        <menu_item_separator

-         layout="topleft" />

-        <!--menu_item_call

-         label="Chat"

-         layout="topleft"

-         name="Chat">

-            <menu_item_call.on_click

-             function="World.Chat" />

-        </menu_item_call-->

-        <menu_item_check

-         label="Nearby Chat"

-         layout="topleft"

-         name="Nearby Chat"

-         shortcut="control|H">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="nearby_chat" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="nearby_chat" />

-        </menu_item_check>

-        <menu_item_call

-         label="Nearby People"

-         layout="topleft"

-         name="Active Speakers"

-         shortcut="control|shift|A">

-            <menu_item_call.on_click

-             function="SideTray.PanelPeopleTab"

-             parameter="nearby_panel" />

-            </menu_item_call>

-        <menu_item_check

-         label="Nearby Media"

-         layout="topleft"

-         name="Nearby Media"

-         shortcut="control|alt|N">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="nearby_media" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="nearby_media" />

-        </menu_item_check>

-        <!--menu_item_check

-         label="Block List"

-         layout="topleft"

-         name="Mute List">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="mute" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="mute" />

-        </menu_item_check-->

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_check

-         label="(Legacy) Communicate"

-         layout="topleft"

-         name="Instant Message"

-         shortcut="control|T">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="communicate" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="communicate" />

-        </menu_item_check>

-        <menu_item_call

-         label="(Temp) Media Remote Ctrl"

-         layout="topleft"

-         name="Preferences"

-         shortcut="control|alt|M">

-            <menu_item_call.on_click

-             function="Floater.Toggle"

-             parameter="media_remote_ctrl" />

-        </menu_item_call>

-    </menu>

-    <menu

-     label="World"

-     layout="topleft"

-     name="World"

-     tear_off="true">

-         <menu_item_check

-         label="Move"

-         layout="topleft"

-         name="Movement Controls">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="moveview" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="moveview" />

-        </menu_item_check>

-        <menu_item_check

-         label="View"

-         layout="topleft"

-         name="Camera Controls">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="camera" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="camera" />

-        </menu_item_check>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_call

-         label="About Land"

-         layout="topleft"

-         name="About Land">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="about_land" />

-        </menu_item_call>

-        <menu_item_call

-         label="Region/Estate"

-         layout="topleft"

-         name="Region/Estate">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="region_info" />

-        </menu_item_call>

-        <menu_item_call

-             label="Buy Land"

-             layout="topleft"

-             name="Buy Land">

-                <menu_item_call.on_click

-                 function="ShowFloater"

-                 parameter="buy land" />

-                <menu_item_call.on_enable

-                 function="World.EnableBuyLand" />

-            </menu_item_call>

-        <menu_item_call

-             label="My Land"

-             layout="topleft"

-             name="My Land">

-                <menu_item_call.on_click

-                 function="ShowFloater"

-                 parameter="land_holdings" />

-        </menu_item_call>

-        <menu

-           create_jump_keys="true"

-           label="Show"

-           layout="topleft"

-           name="Land"

-           tear_off="true">

-          <menu_item_check

-             label="Ban Lines"

-             layout="topleft"

-             name="Ban Lines">

-            <menu_item_check.on_check

-               control="ShowBanLines" />

-            <menu_item_check.on_click

-               function="ToggleControl"

-               parameter="ShowBanLines" />

-          </menu_item_check>

-           <menu_item_check

-                 label="Beacons"

-                 layout="topleft"

-                 name="beacons"

-                 shortcut="control|alt|shift|N">

-                    <menu_item_check.on_check

-                     function="Floater.Visible"

-                     parameter="beacons" />

-                    <menu_item_check.on_click

-                     function="Floater.Toggle"

-                     parameter="beacons" />

-                </menu_item_check>

-          <menu_item_check

-             label="Property Lines"

-             layout="topleft"

-             name="Property Lines"

-             shortcut="control|alt|shift|P">

-            <menu_item_check.on_check

-               control="ShowPropertyLines" />

-            <menu_item_check.on_click

-               function="ToggleControl"

-               parameter="ShowPropertyLines" />

-          </menu_item_check>

-          <menu_item_check

-             label="Land Owners"

-             layout="topleft"

-             name="Land Owners">

-            <menu_item_check.on_check

-               control="ShowParcelOwners" />

-            <menu_item_check.on_click

-               function="ToggleControl"

-               parameter="ShowParcelOwners" />

-          </menu_item_check>

-        </menu>

-        <menu_item_separator

-         layout="topleft" />

-        <menu

-         label="Landmarks"

-         layout="topleft"

-         name="Landmarks"

-         tear_off="true">

-            <menu_item_call

-             label="Create Landmark Here"

-             layout="topleft"

-             name="Create Landmark Here">

-                <menu_item_call.on_click

-                 function="World.CreateLandmark" />

-                <menu_item_call.on_enable

-                 function="World.EnableCreateLandmark" />

-            </menu_item_call>

-            <menu_item_call

-             label="Set Home to Here"

-             layout="topleft"

-             name="Set Home to Here">

-                <menu_item_call.on_click

-                 function="World.SetHomeLocation" />

-                <menu_item_call.on_enable

-                 function="World.EnableSetHomeLocation" />

-            </menu_item_call>

-            <menu_item_call

-             label="Teleport Home"

-             layout="topleft"

-             name="Teleport Home"

-             shortcut="control|shift|H">

-                <menu_item_call.on_click

-                 function="World.TeleportHome" />

-                <menu_item_call.on_enable

-                 function="World.EnableTeleportHome" />

-            </menu_item_call>

-        </menu>

-      <menu_item_check

-         label="Mini-Map"

-         layout="topleft"

-         name="Mini-Map"

-         shortcut="control|shift|M">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="mini_map" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="mini_map" />

-        </menu_item_check>

-         <menu_item_check

-         label="World Map"

-         layout="topleft"

-         name="World Map"

-         shortcut="control|M"

-         use_mac_ctrl="true">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="world_map" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="world_map" />

-        </menu_item_check>

-    <!--    <menu_item_check

-         label="Show Navigation Bar"

-         layout="topleft"

-         name="ShowNavbarNavigationPanel">

-           <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="ShowNavbarNavigationPanel" />

-             <menu_item_check.on_check

-             function="CheckControl"

-             parameter="ShowNavbarNavigationPanel" />

-        </menu_item_check>

-       <menu_item_check

-         label="Show Favorites Bar"

-         layout="topleft"

-         name="ShowNavbarFavoritesPanel">

-           <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="ShowNavbarFavoritesPanel" />

-             <menu_item_check.on_check

-             function="CheckControl"

-             parameter="ShowNavbarFavoritesPanel" />

-        </menu_item_check>

-        <menu_item_separator

-         layout="topleft" />-->

-        <menu_item_call

-         label="Snapshot"

-         layout="topleft"

-         name="Take Snapshot"

-         shortcut="control|shift|S">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="snapshot" />

-        </menu_item_call>

-    <menu

-         create_jump_keys="true"

-         label="Sun"

-         layout="topleft"

-         name="Environment Settings"

-         tear_off="true">

-            <menu_item_call

-             label="Sunrise"

-             layout="topleft"

-             name="Sunrise">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="sunrise" />

-            </menu_item_call>

-            <menu_item_call

-             label="Midday"

-             layout="topleft"

-             name="Noon"

-             shortcut="control|shift|Y">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="noon" />

-            </menu_item_call>

-            <menu_item_call

-             label="Sunset"

-             layout="topleft"

-             name="Sunset"

-             shortcut="control|shift|N">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="sunset" />

-            </menu_item_call>

-            <menu_item_call

-             label="Midnight"

-             layout="topleft"

-             name="Midnight">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="midnight" />

-            </menu_item_call>

-            <menu_item_call

-             label="Use the Estate Time"

-             layout="topleft"

-             name="Revert to Region Default">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="default" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Environment Editor"

-             layout="topleft"

-             name="Environment Editor">

-                <menu_item_call.on_click

-                 function="World.EnvSettings"

-                 parameter="editor" />

-            </menu_item_call>

-        </menu>

-    </menu>

-    <menu

-     create_jump_keys="true"

-     label="Build"

-     layout="topleft"

-     name="BuildTools"

-     tear_off="true"

-     visible="true">

-       <menu_item_check

-         label="Build"

-         layout="topleft"

-         name="Show Build Tools"

-         shortcut="control|B">

-            <menu_item_check.on_check

-             function="Build.Active" />

-            <menu_item_check.on_click

-             function="Build.Toggle" />

-            <menu_item_check.on_enable

-             function="Build.Enabled" />

-       </menu_item_check>

-       <menu

-          create_jump_keys="true"

-          label="Select Build Tool"

-          layout="topleft"

-          name="Select Tool"

-          tear_off="true">

-         <menu_item_call

-			label="Focus Tool"

-			layout="topleft"

-			name="Focus"

-			shortcut="control|1">

-           <menu_item_call.on_click

-              function="Tools.SelectTool"

-              parameter="focus" />

-         </menu_item_call>

-         <menu_item_call

-			label="Move Tool"

-			layout="topleft"

-			name="Move"

-			shortcut="control|2">

-           <menu_item_call.on_click

-              function="Tools.SelectTool"

-              parameter="move" />

-         </menu_item_call>

-         <menu_item_call

-			label="Edit Tool"

-			layout="topleft"

-			name="Edit"

-			shortcut="control|3">

-           <menu_item_call.on_click

-              function="Tools.SelectTool"

-              parameter="edit" />

-         </menu_item_call>

-         <menu_item_call

-			label="Create Tool"

-			layout="topleft"

-			name="Create"

-			shortcut="control|4">

-           <menu_item_call.on_click

-              function="Tools.SelectTool"

-              parameter="create" />

-         </menu_item_call>

-         <menu_item_call

-			label="Land Tool"

-			layout="topleft"

-			name="Land"

-			shortcut="control|5">

-           <menu_item_call.on_click

-              function="Tools.SelectTool"

-              parameter="land" />

-         </menu_item_call>

-	   </menu>

-        <menu

-         create_jump_keys="true"

-         label="Edit"

-         layout="topleft"

-         name="Edit"

-         tear_off="true">

-            <menu_item_call

-             label="Undo"

-             layout="topleft"

-             name="Undo"

-             shortcut="control|Z">

-                <menu_item_call.on_click

-                 function="Edit.Undo" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableUndo" />

-            </menu_item_call>

-            <menu_item_call

-             label="Redo"

-             layout="topleft"

-             name="Redo"

-             shortcut="control|Y">

-                <menu_item_call.on_click

-                 function="Edit.Redo" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableRedo" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Cut"

-             layout="topleft"

-             name="Cut"

-             shortcut="control|X">

-                <menu_item_call.on_click

-                 function="Edit.Cut" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableCut" />

-            </menu_item_call>

-            <menu_item_call

-             label="Copy"

-             layout="topleft"

-             name="Copy"

-             shortcut="control|C">

-                <menu_item_call.on_click

-                 function="Edit.Copy" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableCopy" />

-            </menu_item_call>

-            <menu_item_call

-             label="Paste"

-             layout="topleft"

-             name="Paste"

-             shortcut="control|V">

-                <menu_item_call.on_click

-                 function="Edit.Paste" />

-                <menu_item_call.on_enable

-                 function="Edit.EnablePaste" />

-            </menu_item_call>

-            <menu_item_call

-             label="Delete"

-             layout="topleft"

-             name="Delete"

-             shortcut="Del">

-                <menu_item_call.on_click

-                 function="Edit.Delete" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableDelete" />

-            </menu_item_call>

-            <menu_item_call

-             label="Duplicate"

-             layout="topleft"

-             name="Duplicate"

-             shortcut="control|D">

-                <menu_item_call.on_click

-                 function="Edit.Duplicate" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableDuplicate" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Select All"

-             layout="topleft"

-             name="Select All"

-             shortcut="control|A">

-                <menu_item_call.on_click

-                 function="Edit.SelectAll" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableSelectAll" />

-            </menu_item_call>

-            <menu_item_call

-             label="Deselect"

-             layout="topleft"

-             name="Deselect"

-             shortcut="control|E">

-                <menu_item_call.on_click

-                 function="Edit.Deselect" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableDeselect" />

-            </menu_item_call>

-        </menu>

-        <menu_item_separator

-           layout="topleft" />

-        <menu_item_call

-           label="Link"

-           layout="topleft"

-           name="Link"

-           shortcut="control|L">

-          <menu_item_call.on_click

-             function="Tools.Link" />

-          <menu_item_call.on_enable

-             function="Tools.EnableLink" />

-        </menu_item_call>

-        <menu_item_call

-           label="Unlink"

-           layout="topleft"

-           name="Unlink"

-           shortcut="control|shift|L">

-          <menu_item_call.on_click

-             function="Tools.Unlink" />

-          <menu_item_call.on_enable

-             function="Tools.EnableUnlink" />

-        </menu_item_call>

-        <menu_item_separator

-           layout="topleft" />

-        <menu_item_call

-           label="Focus on Selection"

-           layout="topleft"

-           name="Focus on Selection"

-           shortcut="H">

-          <menu_item_call.on_click

-             function="Tools.LookAtSelection"

-             parameter="focus" />

-          <menu_item_call.on_enable

-             function="Tools.SomethingSelectedNoHUD" />

-        </menu_item_call>

-        <menu_item_call

-           label="Zoom to Selection"

-           layout="topleft"

-           name="Zoom to Selection"

-           shortcut="shift|H">

-          <menu_item_call.on_click

-             function="Tools.LookAtSelection"

-             parameter="zoom" />

-          <menu_item_call.on_enable

-             function="Tools.SomethingSelectedNoHUD" />

-        </menu_item_call>

-        <menu_item_separator

-           layout="topleft" />

-        <menu

-         create_jump_keys="true"

-         label="Object"

-         layout="topleft"

-         name="Object"

-         tear_off="true">

-          <menu_item_call

-			 label="Buy"

-			 layout="topleft"

-			 name="Menu Object Take"

-			 visible="true">

-			<menu_item_call.on_click

-               function="Tools.BuyOrTake" />

-			<menu_item_call.on_enable

-               function="Tools.EnableBuyOrTake"

-               name="EnableBuyOrTake"

-               parameter="Buy,Take" />

-          </menu_item_call>

-          <menu_item_call

-			 label="Take Copy"

-			 layout="topleft"

-			 name="Take Copy">

-			<menu_item_call.on_click

-               function="Tools.TakeCopy" />

-			<menu_item_call.on_enable

-               function="Tools.EnableTakeCopy" />

-          </menu_item_call>

-          <menu_item_call

-			 label="Save Back to My Inventory"

-			 layout="topleft"

-			 name="Save Object Back to My Inventory">

-			<menu_item_call.on_click

-               function="Tools.SaveToInventory" />

-			<menu_item_call.on_enable

-               function="Tools.EnableSaveToInventory" />

-          </menu_item_call>

-          <menu_item_call

-			 label="Save Back to Object Contents"

-			 layout="topleft"

-			 name="Save Object Back to Object Contents">

-			<menu_item_call.on_click

-               function="Tools.SaveToObjectInventory" />

-			<menu_item_call.on_enable

-               function="Tools.EnableSaveToObjectInventory" />

-          </menu_item_call>

-		</menu>

-        <menu

-           create_jump_keys="true"

-           label="Scripts"

-           layout="topleft"

-           name="Scripts"

-           tear_off="true">

-          <menu_item_call

-             label="Recompile Scripts (Mono)"

-             layout="topleft"

-             name="Mono">

-            <menu_item_call.on_click

-               function="Tools.SelectedScriptAction"

-               parameter="compile mono" />

-            <menu_item_call.on_enable

-               function="EditableSelectedMono" />

-          </menu_item_call>

-          <menu_item_call

-             label="Recompile Scripts (LSL)"

-             layout="topleft"

-             name="LSL">

-            <menu_item_call.on_click

-               function="Tools.SelectedScriptAction"

-               parameter="compile lsl" />

-            <menu_item_call.on_enable

-               function="EditableSelected" />

-          </menu_item_call>

-          <menu_item_call

-             label="Reset Scripts"

-             layout="topleft"

-             name="Reset Scripts">

-            <menu_item_call.on_click

-               function="Tools.SelectedScriptAction"

-               parameter="reset" />

-            <menu_item_call.on_enable

-               function="EditableSelected" />

-          </menu_item_call>

-          <menu_item_call

-             label="Set Scripts to Running"

-             layout="topleft"

-             name="Set Scripts to Running">

-            <menu_item_call.on_click

-               function="Tools.SelectedScriptAction"

-               parameter="start" />

-            <menu_item_call.on_enable

-               function="EditableSelected" />

-          </menu_item_call>

-          <menu_item_call

-             label="Set Scripts to Not Running"

-             layout="topleft"

-             name="Set Scripts to Not Running">

-            <menu_item_call.on_click

-               function="Tools.SelectedScriptAction"

-               parameter="stop" />

-            <menu_item_call.on_enable

-               function="EditableSelected" />

-          </menu_item_call>

-        </menu>

-        <menu_item_separator

-           layout="topleft" />

-        <menu

-         create_jump_keys="true"

-         label="Options"

-         layout="topleft"

-         name="Options"

-         tear_off="true">

-            <menu_item_check

-             label="Edit Linked Parts"

-             layout="topleft"

-             name="Edit Linked Parts">

-                <menu_item_check.on_check

-                 control="EditLinkedParts" />

-                <menu_item_check.on_click

-                 function="Tools.EditLinkedParts"

-                 parameter="EditLinkedParts" />

-                <menu_item_check.on_enable

-                 function="Tools.EnableToolNotPie" />

-            </menu_item_check>

-            <menu_item_call

-             label="Set Default Upload Permissions"

-             layout="topleft"

-             name="perm prefs">

-                <menu_item_call.on_click

-                 function="Floater.Toggle"

-                 parameter="perm_prefs" />

-            </menu_item_call>

-			<menu_item_check

-			   label="Show Advanced Permissions"

-			   layout="topleft"

-			   name="DebugPermissions">

-			  <menu_item_check.on_check

-				 function="CheckControl"

-				 parameter="DebugPermissions" />

-			  <menu_item_check.on_click

-				 function="ToggleControl"

-				 parameter="DebugPermissions" />

-			</menu_item_check>

-            <!--menu_item_call

-             label="Show Script Warning/Error Window"

-             layout="topleft"

-             name="Show Script Warning/Error Window">

-                <menu_item_call.on_click

-                 function="ShowFloater"

-                 parameter="script errors" />

-            </menu_item_call-->

-            <menu_item_separator

-             layout="topleft" />

-            <menu

-             create_jump_keys="true"

-             label="Selection"

-             layout="topleft"

-             name="Selection"

-             tear_off="true">

-                <menu_item_check

-                 label="Select Only My Objects"

-                 layout="topleft"

-                 name="Select Only My Objects">

-                    <menu_item_check.on_check

-                     control="SelectOwnedOnly" />

-                    <menu_item_check.on_click

-                     function="Tools.SelectOnlyMyObjects"

-                     parameter="agents" />

-                </menu_item_check>

-                <menu_item_check

-                 label="Select Only Movable Objects"

-                 layout="topleft"

-                 name="Select Only Movable Objects">

-                    <menu_item_check.on_check

-                     control="SelectMovableOnly" />

-                    <menu_item_check.on_click

-                     function="Tools.SelectOnlyMovableObjects"

-                     parameter="movable" />

-                </menu_item_check>

-                <menu_item_check

-                 label="Select By Surrounding"

-                 layout="topleft"

-                 name="Select By Surrounding">

-                    <menu_item_check.on_check

-                     control="RectangleSelectInclusive" />

-                    <menu_item_check.on_click

-                     function="Tools.SelectBySurrounding" />

-                </menu_item_check>

-            </menu>

-            <menu

-             create_jump_keys="true"

-             label="Show"

-             layout="topleft"

-             name="Show"

-             tear_off="true">

-                <menu_item_check

-                 label="Show Hidden Selection"

-                 layout="topleft"

-                 name="Show Hidden Selection">

-                    <menu_item_check.on_check

-                     control="RenderHiddenSelections" />

-                    <menu_item_check.on_click

-                     function="Tools.ShowHiddenSelection" />

-                </menu_item_check>

-                <menu_item_check

-                 label="Show Light Radius for Selection"

-                 layout="topleft"

-                 name="Show Light Radius for Selection">

-                    <menu_item_check.on_check

-                     control="RenderLightRadius" />

-                    <menu_item_check.on_click

-                     function="Tools.ShowSelectionLightRadius" />

-                </menu_item_check>

-                <menu_item_check

-                 label="Show Selection Beam"

-                 layout="topleft"

-                 name="Show Selection Beam">

-                    <menu_item_check.on_check

-                     control="ShowSelectionBeam" />

-                    <menu_item_check.on_click

-                     function="ToggleControl"

-                     parameter="ShowSelectionBeam" />

-                </menu_item_check>

-            </menu>

-            <menu

-             create_jump_keys="true"

-             label="Grid"

-             layout="topleft"

-             name="Grid"

-             tear_off="true">

-                <menu_item_check

-                 label="Snap to Grid"

-                 layout="topleft"

-                 name="Snap to Grid"

-                 shortcut="G">

-                    <menu_item_check.on_check

-                     control="SnapEnabled" />

-                    <menu_item_check.on_click

-                     function="ToggleControl"

-                     parameter="SnapEnabled" />

-                    <menu_item_check.on_enable

-                     function="Tools.EnableToolNotPie" />

-                </menu_item_check>

-                <menu_item_call

-                 label="Snap Object XY to Grid"

-                 layout="topleft"

-                 name="Snap Object XY to Grid"

-                 shortcut="shift|X">

-                    <menu_item_call.on_click

-                     function="Tools.SnapObjectXY" />

-                    <menu_item_call.on_enable

-                     function="Tools.EnableToolNotPie" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Use Selection for Grid"

-                 layout="topleft"

-                 name="Use Selection for Grid"

-                 shortcut="shift|G">

-                    <menu_item_call.on_click

-                     function="Tools.UseSelectionForGrid" />

-                    <menu_item_call.on_enable

-                     function="SomethingSelected" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Grid Options"

-                 layout="topleft"

-                 name="Grid Options"

-                 shortcut="control|shift|B">

-                    <menu_item_call.on_click

-                     function="Floater.Show"

-                     parameter="build_options" />

-                    <menu_item_call.on_enable

-                     function="Tools.EnableToolNotPie" />

-                </menu_item_call>

-            </menu>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Select Linked Parts"

-         layout="topleft"

-         name="Select Linked Parts"

-         tear_off="true">

-            <menu_item_call

-             label="Select Next Part"

-             layout="topleft"

-             name="Select Next Part"

-	     shortcut="control|.">

-                <menu_item_call.on_click

-                 function="Tools.SelectNextPart"

-                 parameter="next" />

-                <menu_item_call.on_enable

-                 function="Tools.EnableSelectNextPart" />

-            </menu_item_call>

-            <menu_item_call

-             label="Select Previous Part"

-             layout="topleft"

-             name="Select Previous Part"

-	     shortcut="control|,">

-                <menu_item_call.on_click

-                 function="Tools.SelectNextPart"

-                 parameter="previous" />

-                <menu_item_call.on_enable

-                 function="Tools.EnableSelectNextPart" />

-            </menu_item_call>

-            <menu_item_call

-             label="Include Next Part"

-             layout="topleft"

-             name="Include Next Part"

-	     shortcut="control|shift|.">

-                <menu_item_call.on_click

-                 function="Tools.SelectNextPart"

-                 parameter="includenext" />

-                <menu_item_call.on_enable

-                 function="Tools.EnableSelectNextPart" />

-            </menu_item_call>

-            <menu_item_call

-             label="Include Previous Part"

-             layout="topleft"

-             name="Include Previous Part"

-	     shortcut="control|shift|,">

-                <menu_item_call.on_click

-                 function="Tools.SelectNextPart"

-                 parameter="includeprevious" />

-                <menu_item_call.on_enable

-                 function="Tools.EnableSelectNextPart" />

-            </menu_item_call>

-        </menu>

-    </menu>

-    <menu

-     label="Help"

-     layout="topleft"

-     name="Help"

-     tear_off="true">

-        <menu_item_call

-         label="[SECOND_LIFE] Help"

-         layout="topleft"

-         name="Second Life Help"

-         shortcut="F1">

-            <menu_item_call.on_click

-             function="ShowFloater"

-             parameter="help f1" />

-        </menu_item_call>

-        <menu_item_call

-         label="Tutorial"

-         layout="topleft"

-         name="Tutorial">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="hud" />

-        </menu_item_call>

-        <menu_item_separator

-             layout="topleft" />

-        <menu_item_call

-             label="Report Abuse"

-             layout="topleft"

-             name="Report Abuse">

-                <menu_item_call.on_click

-                 function="ShowFloater"

-                 parameter="complaint reporter" />

-            </menu_item_call>

-        <menu_item_separator

-             layout="topleft" />

-        <menu_item_call

-         label="About [APP_NAME]"

-         layout="topleft"

-         name="About Second Life">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="sl_about" />

-        </menu_item_call>

-    </menu>

-    <menu

-     label="Advanced"

-     layout="topleft"

-     name="Advanced"

-     tear_off="true"

-     visible="false">

-        <menu_item_check

-         label="Set Away After 30 Minutes"

-         layout="topleft"

-         name="Go Away/AFK When Idle">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="AllowIdleAFK" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="AllowIdleAFK" />

-        </menu_item_check>

-        <menu_item_call

-         label="Stop Animating Me"

-         layout="topleft"

-         name="Stop Animating My Avatar">

-            <menu_item_call.on_click

-             function="Tools.StopAllAnimations" />

-        </menu_item_call>

-        <menu_item_call

-         label="Rebake Textures"

-         layout="topleft"

-         name="Rebake Texture"

-         shortcut="control|alt|R">

-            <menu_item_call.on_click

-             function="Advanced.RebakeTextures" />

-        </menu_item_call>

-        <menu_item_call

-           label="Set UI Size to Default"

-           layout="topleft"

-           name="Set UI Size to Default">

-          <menu_item_call.on_click

-             function="View.DefaultUISize" />

-        </menu_item_call>

-        <menu_item_separator/>

-        <menu_item_check

-         label="Limit Select Distance"

-         layout="topleft"

-         name="Limit Select Distance">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="LimitSelectDistance" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="LimitSelectDistance" />

-        </menu_item_check>

-        <menu_item_check

-         label="Disable Camera Constraints"

-         layout="topleft"

-         name="Disable Camera Distance">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="DisableCameraConstraints" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="DisableCameraConstraints" />

-        </menu_item_check>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_check

-         label="High-res Snapshot"

-         layout="topleft"

-         name="HighResSnapshot">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="HighResSnapshot" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="HighResSnapshot" />

-        </menu_item_check>

-        <menu_item_check

-         label="Quiet Snapshots to Disk"

-         layout="topleft"

-         name="QuietSnapshotsToDisk">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="QuietSnapshotsToDisk" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="QuietSnapshotsToDisk" />

-        </menu_item_check>

-        <menu_item_check

-         label="Compress Snapshots to Disk"

-         layout="topleft"

-         name="CompressSnapshotsToDisk">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="CompressSnapshotsToDisk" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="CompressSnapshotsToDisk" />

-        </menu_item_check>

-        <menu_item_call

-         label="Save Texture As"

-         layout="topleft"

-         name="Save Texture As">

-            <menu_item_call.on_click

-             function="File.SaveTexture" />

-            <menu_item_call.on_enable

-             function="File.EnableSaveAs" />

-        </menu_item_call>

-        <menu_item_separator

-         layout="topleft" />

-        <menu

-         create_jump_keys="true"

-         label="Performance Tools"

-         layout="topleft"

-         name="Performance Tools"

-         tear_off="true">

-            <menu_item_call

-             label="Lag Meter"

-             layout="topleft"

-             name="Lag Meter">

-                <menu_item_call.on_click

-                 function="Floater.Show"

-                 parameter="lagmeter" />

-            </menu_item_call>

-            <menu_item_check

-             label="Statistics Bar"

-             layout="topleft"

-             name="Statistics Bar"

-             shortcut="control|shift|1">

-                <menu_item_check.on_check

-                 function="Floater.Visible"

-                 parameter="stats" />

-                <menu_item_check.on_click

-                 function="Floater.Toggle"

-                 parameter="stats" />

-            </menu_item_check>

-      <menu_item_check

-        label="Show Avatar Rendering Cost"

-        layout="topleft"

-        name="Avatar Rendering Cost">

-           <menu_item_check.on_check

-            function="Advanced.CheckInfoDisplay"

-            parameter="shame" />

-           <menu_item_check.on_click

-            function="Advanced.ToggleInfoDisplay"

-            parameter="shame" />

-       </menu_item_check>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Highlighting and Visibility"

-         layout="topleft"

-         name="Highlighting and Visibility"

-         tear_off="true">

-         <menu_item_check

-                 label="Cheesy Beacon"

-                 layout="topleft"

-                 name="Cheesy Beacon">

-                    <menu_item_check.on_check

-                     function="CheckControl"

-                     parameter="CheesyBeacon" />

-                    <menu_item_check.on_click

-                     function="ToggleControl"

-                     parameter="CheesyBeacon" />

-                </menu_item_check>

-            <menu_item_check

-             label="Hide Particles"

-             layout="topleft"

-             name="Hide Particles"

-             shortcut="control|alt|shift|=">

-                <menu_item_check.on_check

-                 function="View.CheckRenderType"

-                 parameter="hideparticles" />

-                <menu_item_check.on_click

-                 function="View.ToggleRenderType"

-                 parameter="hideparticles" />

-            </menu_item_check>

-            <menu_item_check

-             label="Hide Selected"

-             layout="topleft"

-             name="Hide Selected">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="HideSelectedObjects" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="HideSelectedObjects" />

-            </menu_item_check>

-            <menu_item_check

-             label="Highlight Transparent"

-             layout="topleft"

-             name="Highlight Transparent"

-             shortcut="control|alt|T">

-                <menu_item_check.on_check

-                 function="View.CheckHighlightTransparent" />

-                <menu_item_check.on_click

-                 function="View.HighlightTransparent" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show HUD Attachments"

-             layout="topleft"

-             name="Show HUD Attachments"

-             shortcut="alt|shift|H">

-                <menu_item_check.on_check

-                 function="View.CheckHUDAttachments" />

-                <menu_item_check.on_click

-                 function="View.ShowHUDAttachments" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Mouselook Crosshairs"

-             layout="topleft"

-             name="ShowCrosshairs">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="ShowCrosshairs" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="ShowCrosshairs" />

-            </menu_item_check>

-  <!-- <menu

-         create_jump_keys="true"

-         label="Hover Tips"

-         layout="topleft"

-         name="Hover Tips"

-         tear_off="true">

-            <menu_item_check

-             label="Show Tips"

-             layout="topleft"

-             name="Show Tips"

-             shortcut="control|shift|T">

-                <menu_item_check.on_check

-                 function="View.CheckShowHoverTips" />

-                <menu_item_check.on_click

-                 function="View.ShowHoverTips" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />-->

-            <menu_item_check

-             label="Show Land Tooltips"

-             layout="topleft"

-             name="Land Tips">

-                <menu_item_check.on_check

-                 control="ShowLandHoverTip" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="ShowLandHoverTip" />

-                <menu_item_check.on_enable

-                 function="View.CheckShowHoverTips" />

-            </menu_item_check>

- <!--           <menu_item_check

-             label="Show Tips On All Objects"

-             layout="topleft"

-             name="Tips On All Objects">

-                <menu_item_check.on_check

-                 control="ShowAllObjectHoverTip" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="ShowAllObjectHoverTip" />

-                <menu_item_check.on_enable

-                 function="View.CheckShowHoverTips" />

-            </menu_item_check>

-        </menu>-->

-

-        </menu>

-

-        <menu

-         create_jump_keys="true"

-         label="Rendering Types"

-         layout="topleft"

-         name="Rendering Types"

-         tear_off="true">

-            <menu_item_check

-             label="Simple"

-             layout="topleft"

-             name="Simple"

-             shortcut="control|alt|shift|1">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="simple" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="simple" />

-            </menu_item_check>

-            <menu_item_check

-             label="Alpha"

-             layout="topleft"

-             name="Alpha"

-             shortcut="control|alt|shift|2">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="alpha" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="alpha" />

-            </menu_item_check>

-            <menu_item_check

-             label="Tree"

-             layout="topleft"

-             name="Tree"

-             shortcut="control|alt|shift|3">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="tree" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="tree" />

-            </menu_item_check>

-            <menu_item_check

-             label="Avatars"

-             layout="topleft"

-             name="Character"

-             shortcut="control|alt|shift|4">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="character" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="character" />

-            </menu_item_check>

-            <menu_item_check

-             label="SurfacePath"

-             layout="topleft"

-             name="SurfacePath"

-             shortcut="control|alt|shift|5">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="surfacePath" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="surfacePath" />

-            </menu_item_check>

-            <menu_item_check

-             label="Sky"

-             layout="topleft"

-             name="Sky"

-             shortcut="control|alt|shift|6">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="sky" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="sky" />

-            </menu_item_check>

-            <menu_item_check

-             label="Water"

-             layout="topleft"

-             name="Water"

-             shortcut="control|alt|shift|7">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="water" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="water" />

-            </menu_item_check>

-            <menu_item_check

-             label="Ground"

-             layout="topleft"

-             name="Ground"

-             shortcut="control|alt|shift|8">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="ground" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="ground" />

-            </menu_item_check>

-            <menu_item_check

-             label="Volume"

-             layout="topleft"

-             name="Volume"

-             shortcut="control|alt|shift|9">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="volume" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="volume" />

-            </menu_item_check>

-            <menu_item_check

-             label="Grass"

-             layout="topleft"

-             name="Grass"

-             shortcut="control|alt|shift|0">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="grass" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="grass" />

-            </menu_item_check>

-            <menu_item_check

-             label="Clouds"

-             layout="topleft"

-             name="Clouds"

-             shortcut="control|alt|shift|-">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="clouds" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="clouds" />

-            </menu_item_check>

-            <menu_item_check

-             label="Particles"

-             layout="topleft"

-             name="Particles"

-             shortcut="control|alt|shift|=">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="particles" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="particles" />

-            </menu_item_check>

-            <menu_item_check

-             label="Bump"

-             layout="topleft"

-             name="Bump"

-             shortcut="control|alt|shift|\">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRenderType"

-                 parameter="bump" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRenderType"

-                 parameter="bump" />

-            </menu_item_check>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Rendering Features"

-         layout="topleft"

-         name="Rendering Features"

-         tear_off="true">

-            <menu_item_check

-             label="UI"

-             layout="topleft"

-             name="UI"

-             shortcut="control|alt|F1">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="ui" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="ui" />

-            </menu_item_check>

-            <menu_item_check

-             label="Selected"

-             layout="topleft"

-             name="Selected"

-             shortcut="control|alt|F2">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="selected" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="selected" />

-            </menu_item_check>

-            <menu_item_check

-             label="Highlighted"

-             layout="topleft"

-             name="Highlighted"

-             shortcut="control|alt|F3">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="highlighted" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="highlighted" />

-            </menu_item_check>

-            <menu_item_check

-             label="Dynamic Textures"

-             layout="topleft"

-             name="Dynamic Textures"

-             shortcut="control|alt|F4">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="dynamic textures" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="dynamic textures" />

-            </menu_item_check>

-            <menu_item_check

-             label="Foot Shadows"

-             layout="topleft"

-             name="Foot Shadows"

-             shortcut="control|alt|F5">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="foot shadows" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="foot shadows" />

-            </menu_item_check>

-            <menu_item_check

-             label="Fog"

-             layout="topleft"

-             name="Fog"

-             shortcut="control|alt|F6">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="fog" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="fog" />

-            </menu_item_check>

-            <menu_item_check

-             label="Test FRInfo"

-             layout="topleft"

-             name="Test FRInfo"

-             shortcut="control|alt|F8">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="fr info" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="fr info" />

-            </menu_item_check>

-            <menu_item_check

-             label="Flexible Objects"

-             layout="topleft"

-             name="Flexible Objects"

-             shortcut="control|alt|F9">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFeature"

-                 parameter="flexible" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFeature"

-                 parameter="flexible" />

-            </menu_item_check>

-        </menu>

-        <menu_item_check

-         label="Run Multiple Threads"

-         layout="topleft"

-         name="Run Multiple Threads">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="RunMultipleThreads" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="RunMultipleThreads" />

-        </menu_item_check>

-        <menu_item_call

-         label="Clear Group Cache"

-         layout="topleft"

-         name="ClearGroupCache">

-            <menu_item_call.on_click

-             function="Advanced.ClearGroupCache"

-             parameter="ClearGroupCache" />

-        </menu_item_call>

-        <menu_item_check

-         label="Mouse Smoothing"

-         layout="topleft"

-         name="Mouse Smoothing">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="MouseSmooth" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="MouseSmooth" />

-        </menu_item_check>

-        <menu_item_separator

-         layout="topleft" />

-        <menu

-         label="Shortcuts"

-         layout="topleft"

-         name="Shortcuts"

-         tear_off="true"

-         visible="false">

-            <menu_item_check

-               label="Search"

-               layout="topleft"

-               name="Search"

-               shortcut="control|F">

-            <menu_item_check.on_check

-             function="Floater.Visible"

-             parameter="search" />

-            <menu_item_check.on_click

-             function="Floater.Toggle"

-             parameter="search" />

-            </menu_item_check>

-            <menu_item_call

-             enabled="false"

-             label="Release Keys"

-             layout="topleft"

-             name="Release Keys">

-                <menu_item_call.on_click

-                 function="Tools.ReleaseKeys"

-                 parameter="" />

-                <menu_item_call.on_enable

-                 function="Tools.EnableReleaseKeys"

-                 parameter="" />

-            </menu_item_call>

-            <menu_item_call

-             label="Set UI Size to Default"

-             layout="topleft"

-             name="Set UI Size to Default">

-                <menu_item_call.on_click

-                 function="View.DefaultUISize" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_check

-             label="Always Run"

-             layout="topleft"

-             name="Always Run"

-             shortcut="control|R">

-                <menu_item_check.on_check

-                 function="World.CheckAlwaysRun" />

-                <menu_item_check.on_click

-                 function="World.AlwaysRun" />

-            </menu_item_check>

-            <menu_item_check

-             label="Fly"

-             layout="topleft"

-             name="Fly"

-             shortcut="Home">

-                <menu_item_check.on_click

-                 function="Agent.toggleFlying" />

-                <menu_item_check.on_enable

-                 function="Agent.enableFlying" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Close Window"

-             layout="topleft"

-             name="Close Window"

-             shortcut="control|W">

-                <menu_item_call.on_click

-                 function="File.CloseWindow" />

-                <menu_item_call.on_enable

-                 function="File.EnableCloseWindow" />

-            </menu_item_call>

-            <menu_item_call

-             label="Close All Windows"

-             layout="topleft"

-             name="Close All Windows"

-             shortcut="control|shift|W">

-                <menu_item_call.on_click

-                 function="File.CloseAllWindows" />

-                <menu_item_call.on_enable

-                 function="File.EnableCloseAllWindows" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Snapshot to Disk"

-             layout="topleft"

-             name="Snapshot to Disk"

-             shortcut="control|`"

-             use_mac_ctrl="true">

-                <menu_item_call.on_click

-                 function="File.TakeSnapshotToDisk" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Mouselook"

-             layout="topleft"

-             name="Mouselook"

-             shortcut="M">

-                <menu_item_call.on_click

-                 function="View.Mouselook" />

-                <menu_item_call.on_enable

-                 function="View.EnableMouselook" />

-            </menu_item_call>

-            <menu_item_check

-             label="Joystick Flycam"

-             layout="topleft"

-             name="Joystick Flycam"

-             shortcut="alt|shift|F">

-                <menu_item_check.on_check

-                 function="View.CheckJoystickFlycam" />

-                <menu_item_check.on_click

-                 function="View.JoystickFlycam" />

-                <menu_item_check.on_enable

-                 function="View.EnableJoystickFlycam" />

-            </menu_item_check>

-            <menu_item_call

-             label="Reset View"

-             layout="topleft"

-             name="Reset View"

-             shortcut="Esc">

-                <menu_item_call.on_click

-                 function="View.ResetView" />

-            </menu_item_call>

-            <menu_item_call

-             label="Look at Last Chatter"

-             layout="topleft"

-             name="Look at Last Chatter"

-             shortcut="control|\">

-                <menu_item_call.on_click

-                 function="View.LookAtLastChatter" />

-                <menu_item_call.on_enable

-                 function="View.EnableLastChatter" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu

-             create_jump_keys="true"

-             label="Select Build Tool"

-             layout="topleft"

-             name="Select Tool"

-             tear_off="true">

-                <menu_item_call

-                 label="Focus Tool"

-                 layout="topleft"

-                 name="Focus"

-                 shortcut="control|1">

-                    <menu_item_call.on_click

-                     function="Tools.SelectTool"

-                     parameter="focus" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Move Tool"

-                 layout="topleft"

-                 name="Move"

-                 shortcut="control|2">

-                    <menu_item_call.on_click

-                     function="Tools.SelectTool"

-                     parameter="move" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Edit Tool"

-                 layout="topleft"

-                 name="Edit"

-                 shortcut="control|3">

-                    <menu_item_call.on_click

-                     function="Tools.SelectTool"

-                     parameter="edit" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Create Tool"

-                 layout="topleft"

-                 name="Create"

-                 shortcut="control|4">

-                    <menu_item_call.on_click

-                     function="Tools.SelectTool"

-                     parameter="create" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Land Tool"

-                 layout="topleft"

-                 name="Land"

-                 shortcut="control|5">

-                    <menu_item_call.on_click

-                     function="Tools.SelectTool"

-                     parameter="land" />

-                </menu_item_call>

-            </menu>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Zoom In"

-             layout="topleft"

-             name="Zoom In"

-             shortcut="control|0">

-                <menu_item_call.on_click

-                 function="View.ZoomIn" />

-            </menu_item_call>

-            <menu_item_call

-             label="Zoom Default"

-             layout="topleft"

-             name="Zoom Default"

-             shortcut="control|9">

-                <menu_item_call.on_click

-                 function="View.ZoomDefault" />

-            </menu_item_call>

-            <menu_item_call

-             label="Zoom Out"

-             layout="topleft"

-             name="Zoom Out"

-             shortcut="control|8">

-                <menu_item_call.on_click

-                 function="View.ZoomOut" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Toggle Fullscreen"

-             layout="topleft"

-             name="Toggle Fullscreen"

-             >

-               <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->

-                <menu_item_call.on_click

-                 function="View.Fullscreen" />

-            </menu_item_call>

-        </menu>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_call

-         label="Show Debug Settings"

-         layout="topleft"

-         name="Debug Settings">

-            <menu_item_call.on_click

-             function="Advanced.ShowDebugSettings"

-             parameter="all" />

-        </menu_item_call>

-     <menu_item_check

-         label="Show Develop Menu"

-         layout="topleft"

-         name="Debug Mode"

-         shortcut="control|alt|Q">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="QAMode" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="QAMode" />

-        </menu_item_check>

-    </menu>

-    <menu

-     create_jump_keys="true"

-     label="Develop"

-     layout="topleft"

-     name="Develop"

-     tear_off="true"

-     visible="false">

-        <menu

-         create_jump_keys="true"

-         label="Consoles"

-         layout="topleft"

-         name="Consoles"

-         tear_off="true">

-            <menu_item_check

-             label="Texture Console"

-             layout="topleft"

-             name="Texture Console"

-             shortcut="control|shift|3"

-             use_mac_ctrl="true">

-                <menu_item_check.on_check

-                 function="Advanced.CheckConsole"

-                 parameter="texture" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleConsole"

-                 parameter="texture" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Console"

-             layout="topleft"

-             name="Debug Console"

-             shortcut="control|shift|4"

-             use_mac_ctrl="true">

-                <menu_item_check.on_check

-                 function="Advanced.CheckConsole"

-                 parameter="debug" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleConsole"

-                 parameter="debug" />

-            </menu_item_check>

-            <menu_item_call

-             label="Notifications Console"

-             layout="topleft"

-             name="Notifications"

-             shortcut="control|shift|5">

-              <menu_item_call.on_click

-               function="Floater.Toggle"

-               parameter="notifications_console" />

-            </menu_item_call>

-            <menu_item_check

-               label="Texture Size Console"

-               layout="topleft"

-               name="Texture Size"

-               shortcut="control|shift|6">

-              <menu_item_check.on_check

-               function="Advanced.CheckConsole"

-               parameter="texture size" />

-              <menu_item_check.on_click

-               function="Advanced.ToggleConsole"

-               parameter="texture size" />

-            </menu_item_check>

-            <menu_item_check

-               label="Texture Category Console"

-               layout="topleft"

-               name="Texture Category"

-               shortcut="control|shift|7">

-              <menu_item_check.on_check

-               function="Advanced.CheckConsole"

-               parameter="texture category" />

-              <menu_item_check.on_click

-               function="Advanced.ToggleConsole"

-               parameter="texture category" />

-            </menu_item_check>

-            <menu_item_check

-             label="Fast Timers"

-             layout="topleft"

-             name="Fast Timers"

-             shortcut="control|shift|9"

-             use_mac_ctrl="true">

-                <menu_item_check.on_check

-                 function="Advanced.CheckConsole"

-                 parameter="fast timers" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleConsole"

-                 parameter="fast timers" />

-            </menu_item_check>

-            <menu_item_check

-             label="Memory"

-             layout="topleft"

-             name="Memory"

-             shortcut="control|shift|0"

-             use_mac_ctrl="true">

-                <menu_item_check.on_check

-                 function="Advanced.CheckConsole"

-                 parameter="memory view" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleConsole"

-                 parameter="memory view" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Region Info to Debug Console"

-             layout="topleft"

-             name="Region Info to Debug Console">

-                <menu_item_call.on_click

-                 function="Advanced.DumpInfoToConsole"

-                 parameter="region" />

-            </menu_item_call>

-            <menu_item_call

-             label="Group Info to Debug Console"

-             layout="topleft"

-             name="Group Info to Debug Console">

-                <menu_item_call.on_click

-                 function="Advanced.DumpInfoToConsole"

-                 parameter="group" />

-            </menu_item_call>

-            <menu_item_call

-             label="Capabilities Info to Debug Console"

-             layout="topleft"

-             name="Capabilities Info to Debug Console">

-                <menu_item_call.on_click

-                 function="Advanced.DumpInfoToConsole"

-                 parameter="capabilities" />

-            </menu_item_call>

-            <menu_item_separator

-         layout="topleft" />

-            <menu_item_check

-             label="Camera"

-             layout="topleft"

-             name="Camera">

-                <menu_item_check.on_check

-                 function="Advanced.CheckHUDInfo"

-                 parameter="camera" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleHUDInfo"

-                 parameter="camera" />

-            </menu_item_check>

-            <menu_item_check

-             label="Wind"

-             layout="topleft"

-             name="Wind">

-                <menu_item_check.on_check

-                 function="Advanced.CheckHUDInfo"

-                 parameter="wind" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleHUDInfo"

-                 parameter="wind" />

-            </menu_item_check>

-            <menu_item_check

-             label="FOV"

-             layout="topleft"

-             name="FOV">

-                <menu_item_check.on_check

-                 function="Advanced.CheckHUDInfo"

-                 parameter="fov" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleHUDInfo"

-                 parameter="fov" />

-            </menu_item_check>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Show Info"

-         layout="topleft"

-         name="Display Info"

-         tear_off="true">

-            <menu_item_check

-             label="Show Time"

-             layout="topleft"

-             name="Show Time">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugShowTime" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugShowTime" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Render Info"

-             layout="topleft"

-             name="Show Render Info">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugShowRenderInfo" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugShowRenderInfo" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Matrices"

-             layout="topleft"

-             name="Show Matrices">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugShowRenderMatrices" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugShowRenderMatrices" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Color Under Cursor"

-             layout="topleft"

-             name="Show Color Under Cursor">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugShowColor" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugShowColor" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_check

-             label="Show Updates to Objects"

-             layout="topleft"

-             name="Show Updates"

-             shortcut="control|alt|shift|U">

-                <menu_item_check.on_check

-                 function="Advanced.CheckShowObjectUpdates"

-                 parameter="ObjectUpdates" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleShowObjectUpdates" />

-            </menu_item_check>

-        </menu>

-        <menu_item_separator

-         layout="topleft" />

-        <menu

-         create_jump_keys="true"

-         label="Force an Error"

-         layout="topleft"

-         name="Force Errors"

-         tear_off="true">

-            <menu_item_call

-             label="Force Breakpoint"

-             layout="topleft"

-             name="Force Breakpoint"

-             shortcut="control|alt|shift|B">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorBreakpoint" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force LLError And Crash"

-             layout="topleft"

-             name="Force LLError And Crash">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorLlerror" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Bad Memory Access"

-             layout="topleft"

-             name="Force Bad Memory Access">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorBadMemoryAccess" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Infinite Loop"

-             layout="topleft"

-             name="Force Infinite Loop">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorInfiniteLoop" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Driver Crash"

-             layout="topleft"

-             name="Force Driver Carsh">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorDriverCrash" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Software Exception"

-             layout="topleft"

-             name="Force Software Exception">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorSoftwareException" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Disconnect Viewer"

-             layout="topleft"

-             name="Force Disconnect Viewer">

-                <menu_item_call.on_click

-                 function="Advanced.ForceErrorDisconnectViewer" />

-            </menu_item_call>

-            <menu_item_call

-             label="Simulate a Memory Leak..."

-             layout="topleft"

-             name="Memory Leaking Simulation">

-               <menu_item_call.on_click

-                function="Floater.Show"

-                parameter="mem_leaking" />

-               </menu_item_call>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Render Tests"

-         layout="topleft"

-         name="Render Tests"

-         tear_off="true">

-            <menu_item_check

-             label="Camera Offset"

-             layout="topleft"

-             name="Camera Offset">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="CameraOffset" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="CameraOffset" />

-            </menu_item_check>

-            <menu_item_check

-             label="Randomize Framerate"

-             layout="topleft"

-             name="Randomize Framerate">

-                <menu_item_check.on_check

-                 function="Advanced.CheckRandomizeFramerate"

-                 parameter="Randomize Framerate" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleRandomizeFramerate" />

-            </menu_item_check>

-            <menu_item_check

-             label="Periodic Slow Frame"

-             layout="topleft"

-             name="Periodic Slow Frame">

-                <menu_item_check.on_check

-                 function="Advanced.CheckPeriodicSlowFrame"

-                 parameter="points" />

-                <menu_item_check.on_click

-                 function="Advanced.TogglePeriodicSlowFrame"

-                 parameter="points" />

-            </menu_item_check>

-            <menu_item_check

-             label="Frame Test"

-             layout="topleft"

-             name="Frame Test">

-                <menu_item_check.on_check

-                 function="Advanced.CheckFrameTest"

-                 parameter="Frame Test" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleFrameTest" />

-            </menu_item_check>

-        </menu>

-      <menu

-        create_jump_keys="true"

-        label="Render Metadata"

-        layout="topleft"

-        name="Render Metadata"

-        tear_off="true">

-        <menu_item_check

-         label="Bounding Boxes"

-         layout="topleft"

-         name="Bounding Boxes">

-        <menu_item_check.on_check

-         function="Advanced.CheckInfoDisplay"

-         parameter="bboxes" />

-        <menu_item_check.on_click

-         function="Advanced.ToggleInfoDisplay"

-         parameter="bboxes" />

-        </menu_item_check>

-        <menu_item_check

-         label="Octree"

-         layout="topleft"

-         name="Octree">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="octree" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="octree" />

-        </menu_item_check>

-        <menu_item_check

-         label="Shadow Frusta"

-         layout="topleft"

-         name="Shadow Frusta">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="shadow frusta" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="shadow frusta" />

-        </menu_item_check>

-        <menu_item_check

-         label="Occlusion"

-         layout="topleft"

-         name="Occlusion">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="occlusion" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="occlusion" />

-        </menu_item_check>

-        <menu_item_check

-         label="Render Batches"

-         layout="topleft"

-         name="Render Batches">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="render batches" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="render batches" />

-        </menu_item_check>

-        <menu_item_check

-         label="Texture Anim"

-         layout="topleft"

-         name="Texture Anim">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="texture anim" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="texture anim" />

-        </menu_item_check>

-        <menu_item_check

-         label="Texture Priority"

-         layout="topleft"

-         name="Texture Priority">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="texture priority" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="texture priority" />

-        </menu_item_check>

-        <menu_item_check

-         label="Texture Area"

-         layout="topleft"

-         name="Texture Area">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="texture area" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="texture area" />

-        </menu_item_check>

-        <menu_item_check

-         label="Face Area"

-         layout="topleft"

-         name="Face Area">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="face area" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="face area" />

-        </menu_item_check>

-        <menu_item_check

-         label="Lights"

-         layout="topleft"

-         name="Lights">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="lights" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="lights" />

-        </menu_item_check>

-        <menu_item_check

-         label="Collision Skeleton"

-         layout="topleft"

-         name="Collision Skeleton">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="collision skeleton" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="collision skeleton" />

-        </menu_item_check>

-        <menu_item_check

-         label="Raycast"

-         layout="topleft"

-         name="Raycast">

-          <menu_item_check.on_check

-           function="Advanced.CheckInfoDisplay"

-           parameter="raycast" />

-          <menu_item_check.on_click

-           function="Advanced.ToggleInfoDisplay"

-           parameter="raycast" />

-        </menu_item_check>

-      </menu>

-        <menu

-         create_jump_keys="true"

-         label="Rendering"

-         layout="topleft"

-         name="Rendering"

-         tear_off="true">

-            <menu_item_check

-             label="Axes"

-             name="Axes">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="ShowAxes" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="ShowAxes" />

-            </menu_item_check>

-            <menu_item_check

-             label="Tangent Basis"

-             name="Tangent Basis">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="ShowTangentBasis" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="ShowTangentBasis" />

-            </menu_item_check>

-            <menu_item_call

-             label="Selected Texture Info Basis"

-             name="Selected Texture Info Basis"

-             shortcut="control|alt|shift|T">

-                <menu_item_call.on_click

-                 function="Advanced.SelectedTextureInfo" />

-            </menu_item_call>

-            <menu_item_check

-             label="Wireframe"

-             name="Wireframe"

-             shortcut="control|shift|R">

-                <menu_item_check.on_check

-                 function="Advanced.CheckWireframe"

-                 parameter="Wireframe" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleWireframe" />

-            </menu_item_check>

-            <menu_item_check

-             label="Object-Object Occlusion"

-             name="Object-Object Occlusion"

-             shortcut="control|shift|O">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="UseOcclusion" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="UseOcclusion" />

-                <menu_item_check.on_enable

-                 function="Advanced.EnableObjectObjectOcclusion" />

-            </menu_item_check>

-          <menu_item_check

-             label="Framebuffer Objects"

-             name="Framebuffer Objects">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="RenderUseFBO" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="RenderUseFBO" />

-            <menu_item_check.on_enable

-                 function="Advanced.EnableRenderFBO" />

-           </menu_item_check>

-          <menu_item_check

-                       label="Deferred Rendering"

-                       name="Deferred Rendering">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="RenderDeferred" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="RenderDeferred" />

-            <menu_item_check.on_enable

-                 function="Advanced.EnableRenderDeferred" />

-          </menu_item_check>

-          <menu_item_check

-                   label="Global Illumintation"

-                   name="Global Illumination">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="RenderDeferredGI" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="RenderDeferredGI" />

-            <menu_item_check.on_enable

-                 function="Advanced.EnableRenderDeferredGI" />

-          </menu_item_check>

-          <menu_item_separator />

-          <menu_item_check

-             label="Debug GL"

-             name="Debug GL">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderDebugGL" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="RenderDebugGL" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Pipeline"

-             name="Debug Pipeline">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderDebugGL" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="RenderDebugGL" />

-            </menu_item_check>

-            <menu_item_check

-             label="Fast Alpha"

-             name="Fast Alpha">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderDebugGL" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="RenderDebugGL" />

-            </menu_item_check>

-            <menu_item_check

-             label="Animation Textures"

-             name="Animation Textures">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderDebugGL" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="RenderDebugGL" />

-            </menu_item_check>

-            <menu_item_check

-             label="Disable Textures"

-             name="Disable Textures">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="TextureDisable" />

-                <menu_item_check.on_click

-                 function="ToggleControl" 

-                 parameter="TextureDisable" />

-            </menu_item_check>

-            <menu_item_check

-              label="Full Res Textures"

-             layout="topleft"

-             name="Rull Res Textures">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="TextureLoadFullRes" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="TextureLoadFullRes" />

-            </menu_item_check>

-            <menu_item_check

-               label="Audit Textures"

-               layout="topleft"

-               name="Audit Textures">

-              <menu_item_check.on_check

-               function="CheckControl"

-               parameter="AuditTexture" />

-              <menu_item_check.on_click

-               function="ToggleControl"

-               parameter="AuditTexture" />

-            </menu_item_check>

-            <menu_item_check

-             label="Texture Atlas"

-             name="Texture Atlas">

-              <menu_item_check.on_check

-               function="CheckControl"

-               parameter="EnableTextureAtlas" />

-              <menu_item_check.on_click

-               function="ToggleControl"

-               parameter="EnableTextureAtlas" />

-            </menu_item_check>

-              <menu_item_check

-             label="Render Attached Lights"

-             name="Render Attached Lights">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderAttachedLights" />

-                <menu_item_check.on_click

-                 function="Advanced.HandleAttchedLightParticles"

-                 parameter="RenderAttachedLights" />

-            </menu_item_check>

-            <menu_item_check

-             label="Render Attached Particles"

-             name="Render Attached Particles">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderAttachedParticles" />

-                <menu_item_check.on_click

-                 function="Advanced.HandleAttchedLightParticles"

-                 parameter="RenderAttachedParticles" />

-            </menu_item_check>

-            <menu_item_check

-             label="Hover Glow Objects"

-             name="Hover Glow Objects">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="RenderHighlightEnable" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="RenderHighlightEnable" />

-            </menu_item_check>

-        </menu>

-

-        <menu

-         create_jump_keys="true"

-         label="Network"

-         layout="topleft"

-         name="Network"

-         tear_off="true">

-            <menu_item_check

-             label="Pause Agent"

-             layout="topleft"

-             name="AgentPause">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="AgentPause" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="AgentPause" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Enable Message Log"

-             layout="topleft"

-             name="Enable Message Log">

-                <menu_item_call.on_click

-                 function="Advanced.EnableMessageLog" />

-            </menu_item_call>

-            <menu_item_call

-             label="Disable Message Log"

-             layout="topleft"

-             name="Disable Message Log">

-                <menu_item_call.on_click

-                 function="Advanced.DisableMessageLog" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_check

-             label="Velocity Interpolate Objects"

-             layout="topleft"

-             name="Velocity Interpolate Objects">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="VelocityInterpolate" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="VelocityInterpolate" />

-            </menu_item_check>

-            <menu_item_check

-             label="Ping Interpolate Object Positions"

-             layout="topleft"

-             name="Ping Interpolate Object Positions">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="PingInterpolate" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="PingInterpolate" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="Drop a Packet"

-             layout="topleft"

-             name="Drop a Packet"

-             shortcut="control|alt|L">

-                <menu_item_call.on_click

-                 function="Advanced.DropPacket" />

-            </menu_item_call>

-        </menu>

-        <menu_item_call

-         label="Dump Scripted Camera"

-         layout="topleft"

-         name="Dump Scripted Camera">

-            <menu_item_call.on_click

-             function="Advanced.DumpScriptedCamera" />

-        </menu_item_call>

-        <menu_item_call

-             label="Bumps, Pushes &amp; Hits"

-             layout="topleft"

-             name="Bumps, Pushes &amp;amp; Hits">

-                <menu_item_call.on_click

-                 function="Floater.Show"

-                 parameter="bumps" />

-            </menu_item_call>

-

-        <menu

-         create_jump_keys="true"

-         label="Recorder"

-         layout="topleft"

-         name="Recorder"

-         tear_off="true">

-            <menu_item_call

-             label="Start Playback"

-             layout="topleft"

-             name="Start Playback">

-                <menu_item_call.on_click

-                 function="Advanced.AgentPilot"

-                 parameter="start playback" />

-            </menu_item_call>

-            <menu_item_call

-             label="Stop Playback"

-             layout="topleft"

-             name="Stop Playback">

-                <menu_item_call.on_click

-                 function="Advanced.AgentPilot"

-                 parameter="stop playback" />

-            </menu_item_call>

-            <menu_item_check

-             label="Loop Playback"

-             layout="topleft"

-             name="Loop Playback">

-                <menu_item_check.on_check

-                 function="Advanced.CheckAgentPilotLoop"

-                 parameter="loopPlayback" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleAgentPilotLoop" />

-            </menu_item_check>

-            <menu_item_call

-             label="Start Record"

-             layout="topleft"

-             name="Start Record">

-                <menu_item_call.on_click

-                 function="Advanced.AgentPilot"

-                 parameter="start record" />

-            </menu_item_call>

-            <menu_item_call

-             label="Stop Record"

-             layout="topleft"

-             name="Stop Record">

-                <menu_item_call.on_click

-                 function="Advanced.AgentPilot"

-                 parameter="stop record" />

-            </menu_item_call>

-        </menu>

-

-        <menu

-         create_jump_keys="true"

-         label="World"

-         layout="topleft"

-         name="World"

-         tear_off="true">

-            <menu_item_check

-             label="Sim Sun Override"

-             layout="topleft"

-             name="Sim Sun Override">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="SkyOverrideSimSunPosition" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="SkyOverrideSimSunPosition" />

-            </menu_item_check>

-            <menu_item_check

-             label="Cheesy Beacon"

-             layout="topleft"

-             name="Cheesy Beacon">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="CheesyBeacon" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="CheesyBeacon" />

-            </menu_item_check>

-            <menu_item_check

-             label="Fixed Weather"

-             layout="topleft"

-             name="Fixed Weather">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="FixedWeather" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="FixedWeather" />

-            </menu_item_check>

-            <menu_item_call

-             label="Dump Region Object Cache"

-             layout="topleft"

-             name="Dump Region Object Cache">

-                <menu_item_call.on_click

-                 function="Advanced.DumpRegionObjectCache" />

-            </menu_item_call>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="UI"

-         layout="topleft"

-         name="UI"

-         tear_off="true">

-         <!--   <menu_item_check

-             label="New Bottom Bar"

-             layout="topleft"

-             name="New Bottom Bar">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="BottomPanelNew" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="BottomPanelNew" />

-            </menu_item_check>-->

-            <menu_item_call

-             label="Web Browser Test"

-             layout="topleft"

-             name="Web Browser Test">

-                <menu_item_call.on_click

-                 function="Advanced.WebBrowserTest"

-                 parameter="http://secondlife.com/app/search/slurls.html"/>

-            </menu_item_call>

-            <menu_item_call

-             label="Dump SelectMgr"

-             layout="topleft"

-             name="Dump SelectMgr">

-                <menu_item_call.on_click

-                 function="Advanced.DumpSelectMgr" />

-            </menu_item_call>

-            <menu_item_call

-             label="Dump Inventory"

-             layout="topleft"

-             name="Dump Inventory">

-                <menu_item_call.on_click

-                 function="Advanced.DumpInventory" />

-            </menu_item_call>

-            <menu_item_call

-             label="Dump Timers"

-             name="Dump Timers">

-                <menu_item_call.on_click

-                 function="Advanced.DumpTimers" />

-            </menu_item_call>

-            <menu_item_call

-             label="Dump Focus Holder"

-             layout="topleft"

-             name="Dump Focus Holder"

-             shortcut="control|alt|F">

-                <menu_item_call.on_click

-                 function="Advanced.DumpFocusHolder" />

-            </menu_item_call>

-            <menu_item_call

-             label="Print Selected Object Info"

-             layout="topleft"

-             name="Print Selected Object Info"

-             shortcut="control|shift|P">

-                <menu_item_call.on_click

-                 function="Advanced.PrintSelectedObjectInfo" />

-            </menu_item_call>

-            <menu_item_call

-             label="Print Agent Info"

-             layout="topleft"

-             name="Print Agent Info"

-             shortcut="shift|P">

-                <menu_item_call.on_click

-                 function="Advanced.PrintAgentInfo" />

-            </menu_item_call>

-            <menu_item_call

-             label="Memory Stats"

-             layout="topleft"

-             name="Memory Stats"

-             shortcut="control|alt|shift|M">

-                <menu_item_call.on_click

-                 function="Advanced.PrintTextureMemoryStats" />

-            </menu_item_call>

-            <menu_item_check

-             label="Double-ClickAuto-Pilot"

-             layout="topleft"

-             name="Double-ClickAuto-Pilot">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DoubleClickAutoPilot" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DoubleClickAutoPilot" />

-            </menu_item_check>

-

-            <menu_item_separator />

-            <menu_item_check

-             label="Debug SelectMgr"

-             layout="topleft"

-             name="Debug SelectMgr">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugSelectMgr" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugSelectMgr" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Clicks"

-             layout="topleft"

-             name="Debug Clicks">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugClicks"

-                 parameter="DebugClicks" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugClicks"

-                 parameter="DebugClicks" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Views"

-             layout="topleft"

-             name="Debug Views">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugViews" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugViews" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Name Tooltips"

-             layout="topleft"

-             name="Debug Name Tooltips">

-                <menu_item_check.on_check

-                 function="Advanced.CheckXUINameTooltips"

-                 parameter="XUINameTooltips" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleXUINameTooltips" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Mouse Events"

-             layout="topleft"

-             name="Debug Mouse Events">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugMouseEvents"

-                 parameter="MouseEvents" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugMouseEvents" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Keys"

-             layout="topleft"

-             name="Debug Keys">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugKeys"

-                 parameter="DebugKeys" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugKeys" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug WindowProc"

-             layout="topleft"

-             name="Debug WindowProc">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugWindowProc"

-                 parameter="DebugWindowProc" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugWindowProc"

-                 parameter="DebugWindowProc" />

-            </menu_item_check>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="XUI"

-         name="XUI"

-         tear_off="true">

-            <menu_item_call

-               label="Reload Color Settings"

-               layout="topleft"

-               name="Reload Color Settings">

-              <menu_item_call.on_click

-               function="Advanced.ReloadColorSettings" />

-            </menu_item_call>

-            <menu_item_call

-             label="Show Font Test"

-             layout="topleft"

-             name="Show Font Test">

-                <menu_item_call.on_click

-                 function="Floater.Show"

-                 parameter="font_test" />

-            </menu_item_call>

-            <menu_item_call

-             label="Load from XML..."

-             layout="topleft"

-             name="Load from XML">

-                <menu_item_call.on_click

-                 function="Advanced.LoadUIFromXML" />

-            </menu_item_call>

-            <menu_item_call

-             label="Save to XML..."

-             layout="topleft"

-             name="Save to XML">

-                <menu_item_call.on_click

-                 function="Advanced.SaveUIToXML" />

-            </menu_item_call>

-            <menu_item_check

-             label="Show XUI Names"

-             layout="topleft"

-             name="Show XUI Names">

-                <menu_item_check.on_check

-                 function="Advanced.CheckXUINames"

-                 parameter="showUIname" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleXUINames" />

-            </menu_item_check>

-          <menu_item_call

-           label="Send Test IMs"

-           layout="topleft"

-           name="Send Test IMs">

-            <menu_item_call.on_click

-             function="Advanced.SendTestIMs" />

-          </menu_item_call>

-          <menu_item_call

-           label="Test Inspectors"

-           name="Test Inspectors"

-           shortcut="control|shift|I">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="test_inspectors" />

-          </menu_item_call>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Avatar"

-         layout="topleft"

-         name="Character"

-         tear_off="true">

-            <menu

-             create_jump_keys="true"

-             label="Grab Baked Texture"

-             layout="topleft"

-             name="Grab Baked Texture"

-             tear_off="true">

-                <menu_item_call

-                 label="Iris"

-                 layout="topleft"

-                 name="Iris">

-                    <menu_item_call.on_click

-                     function="Advanced.GrabBakedTexture"

-                     parameter="iris" />

-                    <menu_item_call.on_enable

-                     function="Advanced.EnableGrabBakedTexture"

-					 parameter="iris" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Head"

-                 layout="topleft"

-                 name="Head">

-                    <menu_item_call.on_click

-                     function="Advanced.GrabBakedTexture"

-                     parameter="head" />

-                    <menu_item_call.on_enable

-                     function="Advanced.EnableGrabBakedTexture"

-					 parameter="head" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Upper Body"

-                 layout="topleft"

-                 name="Upper Body">

-                    <menu_item_call.on_click

-                     function="Advanced.GrabBakedTexture"

-                     parameter="upper" />

-                    <menu_item_call.on_enable

-                     function="Advanced.EnableGrabBakedTexture"

-					 parameter="upper" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Lower Body"

-                 layout="topleft"

-                 name="Lower Body">

-                    <menu_item_call.on_click

-                     function="Advanced.GrabBakedTexture"

-                     parameter="lower" />

-                    <menu_item_call.on_enable

-                     function="Advanced.EnableGrabBakedTexture"

-					 parameter="lower" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Skirt"

-                 layout="topleft"

-                 name="Skirt">

-                    <menu_item_call.on_click

-                     function="Advanced.GrabBakedTexture"

-                     parameter="skirt" />

-                    <menu_item_call.on_enable

-                     function="Advanced.EnableGrabBakedTexture"

-					 parameter="skirt" />

-                </menu_item_call>

-            </menu>

-            <menu

-             create_jump_keys="true"

-             label="Character Tests"

-             layout="topleft"

-             name="Character Tests"

-             tear_off="true">

-                <menu_item_call

-                 label="Appearance To XML"

-                 layout="topleft"

-                 name="Appearance To XML">

-                    <menu_item_call.on_click

-                     function="Advanced.AppearanceToXML" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Toggle Character Geometry"

-                 layout="topleft"

-                 name="Toggle Character Geometry">

-                    <menu_item_call.on_click

-                     function="Advanced.ToggleCharacterGeometry" />

-                    <menu_item_call.on_enable

-                     function="IsGodCustomerService" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Test Male"

-                 layout="topleft"

-                 name="Test Male">

-                    <menu_item_call.on_click

-                     function="Advanced.TestMale" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Test Female"

-                 layout="topleft"

-                 name="Test Female">

-                    <menu_item_call.on_click

-                     function="Advanced.TestFemale" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Toggle PG"

-                 layout="topleft"

-                 name="Toggle PG">

-                    <menu_item_call.on_click

-                     function="Advanced.TogglePG" />

-                </menu_item_call>

-                <menu_item_check

-                 label="Allow Select Avatar"

-                 layout="topleft"

-                 name="Allow Select Avatar">

-                    <menu_item_check.on_check

-                     function="CheckControl"

-                     parameter="AllowSelectAvatar" />

-                    <menu_item_check.on_click

-                     function="ToggleControl"

-                     parameter="AllowSelectAvatar" />

-                </menu_item_check>

-            </menu>

-            <menu_item_call

-             label="Force Params to Default"

-             layout="topleft"

-             name="Force Params to Default">

-                <menu_item_call.on_click

-                 function="Advanced.ForceParamsToDefault" />

-            </menu_item_call>

-            <menu_item_check

-             label="Animation Info"

-             layout="topleft"

-             name="Animation Info">

-                <menu_item_check.on_check

-                 function="Advanced.CheckAnimationInfo"

-                 parameter="AnimationInfo" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleAnimationInfo"

-                 parameter="" />

-            </menu_item_check>

-            <menu_item_check

-             label="Slow Motion Animations"

-             layout="topleft"

-             name="Slow Motion Animations">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="SlowMotionAnimation" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="SlowMotionAnimation" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Look At"

-             layout="topleft"

-             name="Show Look At">

-                <menu_item_check.on_check

-                 function="Advanced.CheckShowLookAt"

-                 parameter="ShowLookAt" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleShowLookAt" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Point At"

-             layout="topleft"

-             name="Show Point At">

-                <menu_item_check.on_check

-                 function="Advanced.CheckShowPointAt"

-                 parameter="ShowPointAt" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleShowPointAt" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Joint Updates"

-             layout="topleft"

-             name="Debug Joint Updates">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugJointUpdates"

-                 parameter="DebugJointUpdates" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugJointUpdates" />

-            </menu_item_check>

-            <menu_item_check

-             label="Disable LOD"

-             layout="topleft"

-             name="Disable LOD">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDisableLOD"

-                 parameter="DisableLOD" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDisableLOD" />

-            </menu_item_check>

-            <menu_item_check

-             label="Debug Character Vis"

-             layout="topleft"

-             name="Debug Character Vis">

-                <menu_item_check.on_check

-                 function="Advanced.CheckDebugCharacterVis"

-                 parameter="DebugCharacterVis" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleDebugCharacterVis" />

-            </menu_item_check>

-            <menu_item_check

-             label="Show Collision Skeleton"

-             layout="topleft"

-             name="Show Collision Skeleton">

-                <menu_item_check.on_check

-                 function="Advanced.CheckInfoDisplay"

-                 parameter="collision skeleton" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleInfoDisplay"

-                 parameter="collision skeleton" />

-            </menu_item_check>

-            <menu_item_check

-             label="Display Agent Target"

-             layout="topleft"

-             name="Display Agent Target">

-                <menu_item_check.on_check

-                 function="Advanced.CheckInfoDisplay"

-                 parameter="agent target" />

-                <menu_item_check.on_click

-                 function="Advanced.ToggleInfoDisplay"

-                 parameter="agent target" />

-            </menu_item_check>

-<!-- Appears not to exist anymore

-            <menu_item_check

-             label="Debug Rotation"

-             layout="topleft"

-             name="Debug Rotation">

-                <menu_item_check.on_check

-                 function="CheckControl"

-                 parameter="DebugAvatarRotation" />

-                <menu_item_check.on_click

-                 function="ToggleControl"

-                 parameter="DebugAvatarRotation" />

-            </menu_item_check> -->

--->

-            <menu_item_call

-             label="Dump Attachments"

-             layout="topleft"

-             name="Dump Attachments">

-                <menu_item_call.on_click

-                 function="Advanced.DumpAttachments" />

-            </menu_item_call>

-            <menu_item_call

-             label="Debug Avatar Textures"

-             layout="topleft"

-             name="Debug Avatar Textures"

-             shortcut="control|alt|shift|A">

-                <menu_item_call.on_click

-                 function="Advanced.DebugAvatarTextures" />

-            </menu_item_call>

-            <menu_item_call

-             label="Dump Local Textures"

-             layout="topleft"

-             name="Dump Local Textures"

-             shortcut="alt|shift|M">

-                <menu_item_call.on_click

-                 function="Advanced.DumpAvatarLocalTextures" />

-            </menu_item_call>

-        </menu>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_call

-         label="Compress Images"

-         layout="topleft"

-         name="Compress Images">

-            <menu_item_call.on_click

-             function="Advanced.CompressImage" />

-        </menu_item_call>

-        <menu_item_check

-         label="Output Debug Minidump"

-         layout="topleft"

-         name="Output Debug Minidump">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="SaveMinidump" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="SaveMinidump" />

-        </menu_item_check>

-        <menu_item_check

-         label="Console Window on next Run"

-         layout="topleft"

-         name="Console Window">

-            <menu_item_check.on_check

-             function="CheckControl"

-             parameter="ShowConsoleWindow" />

-            <menu_item_check.on_click

-             function="ToggleControl"

-             parameter="ShowConsoleWindow" />

-        </menu_item_check>

-        <menu_item_separator

-         layout="topleft" />

-        <menu_item_check

-         label="Show Admin Menu"

-         layout="topleft"

-         name="View Admin Options">

-            <menu_item_check.on_check

-             function="Advanced.CheckViewAdminOptions"

-             parameter="ViewAdminOptions" />

-            <menu_item_check.on_click

-             function="Advanced.ToggleViewAdminOptions" />

-        </menu_item_check>

-        <menu_item_call

-         label="Request Admin Status"

-         layout="topleft"

-         name="Request Admin Options"

-         shortcut="control|alt|G">

-            <menu_item_call.on_click

-             function="Advanced.RequestAdminStatus" />

-        </menu_item_call>

-        <menu_item_call

-         label="Leave Admin Status"

-         layout="topleft"

-         name="Leave Admin Options"

-         shortcut="control|alt|shift|G">

-            <menu_item_call.on_click

-             function="Advanced.LeaveAdminStatus" />

-        </menu_item_call>

-    </menu>

-    <menu

-     create_jump_keys="true"

-     label="Admin"

-     layout="topleft"

-     name="Admin"

-     tear_off="true"

-     visible="false">

-        <menu

-         create_jump_keys="true"

-         label="Object"

-         layout="topleft"

-         tear_off="true">

-            <menu_item_call

-             label="Take Copy"

-             layout="topleft"

-             name="Take Copy"

-             shortcut="control|alt|shift|O">

-                <menu_item_call.on_click

-                 function="Admin.ForceTakeCopy" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Owner To Me"

-             layout="topleft"

-             name="Force Owner To Me">

-                <menu_item_call.on_click

-                 function="Admin.HandleObjectOwnerSelf" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Force Owner Permissive"

-             layout="topleft"

-             name="Force Owner Permissive">

-                <menu_item_call.on_click

-                 function="Admin.HandleObjectOwnerPermissive" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Delete"

-             layout="topleft"

-             name="Delete"

-             shortcut="control|alt|shift|Del">

-                <menu_item_call.on_click

-                 function="Admin.HandleForceDelete" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Lock"

-             layout="topleft"

-             name="Lock"

-             shortcut="control|alt|shift|L">

-                <menu_item_call.on_click

-                 function="Admin.HandleObjectLock" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Get Assets IDs"

-             layout="topleft"

-             name="Get Assets IDs"

-             shortcut="control|alt|shift|I">

-                <menu_item_call.on_click

-                 function="Admin.HandleObjectAssetIDs" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Parcel"

-         layout="topleft"

-         name="Parcel"

-         tear_off="true">

-            <menu_item_call

-             label="Owner To Me"

-             layout="topleft"

-             name="Owner To Me">

-                <menu_item_call.on_click

-                 function="Admin.HandleForceParcelOwnerToMe" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Set to Linden Content"

-             layout="topleft"

-             name="Set to Linden Content"

-             shortcut="control|alt|shift|C">

-                <menu_item_call.on_click

-                 function="Admin.HandleForceParcelToContent" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Claim Public Land"

-             layout="topleft"

-             name="Claim Public Land">

-                <menu_item_call.on_click

-                 function="Admin.HandleClaimPublicLand" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-        </menu>

-        <menu

-         create_jump_keys="true"

-         label="Region"

-         layout="topleft"

-         name="Region"

-         tear_off="true">

-            <menu_item_call

-             label="Dump Temp Asset Data"

-             layout="topleft"

-             name="Dump Temp Asset Data">

-                <menu_item_call.on_click

-                 function="Admin.HandleRegionDumpTempAssetData" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-            <menu_item_call

-             label="Save Region State"

-             layout="topleft"

-             name="Save Region State">

-                <menu_item_call.on_click

-                 function="Admin.OnSaveState" />

-                <menu_item_call.on_enable

-                 function="IsGodCustomerService" />

-            </menu_item_call>

-        </menu>

-        <menu_item_call

-         label="God Tools"

-         layout="topleft"

-         name="God Tools">

-            <menu_item_call.on_click

-             function="Floater.Show"

-             parameter="god_tools" />

-            <menu_item_call.on_enable

-             function="IsGodCustomerService" />

-        </menu_item_call>

-    </menu>

-    <menu

-     create_jump_keys="true"

-     label="Admin"

-     layout="topleft"

-     name="Deprecated"

-     tear_off="true"

-     visible="false">

-        <menu

-         create_jump_keys="true"

-         label="Attach Object"

-         layout="topleft"

-         mouse_opaque="false"

-         name="Attach Object"

-         tear_off="true" />

-        <menu

-         create_jump_keys="true"

-         label="Detach Object"

-         layout="topleft"

-         mouse_opaque="false"

-         name="Detach Object"

-         tear_off="true" />

-        <menu

-         create_jump_keys="true"

-         label="Take Off Clothing"

-         layout="topleft"

-         mouse_opaque="false"

-         name="Take Off Clothing"

-         tear_off="true">

-            <menu_item_call

-             label="Shirt"

-             layout="topleft"

-             name="Shirt">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="shirt" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="shirt" />

-            </menu_item_call>

-            <menu_item_call

-             label="Pants"

-             layout="topleft"

-             name="Pants">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="pants" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="pants" />

-            </menu_item_call>

-            <menu_item_call

-             label="Shoes"

-             layout="topleft"

-             name="Shoes">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="shoes" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="shoes" />

-            </menu_item_call>

-            <menu_item_call

-             label="Socks"

-             layout="topleft"

-             name="Socks">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="socks" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="socks" />

-            </menu_item_call>

-            <menu_item_call

-             label="Jacket"

-             layout="topleft"

-             name="Jacket">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="jacket" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="jacket" />

-            </menu_item_call>

-            <menu_item_call

-             label="Gloves"

-             layout="topleft"

-             name="Gloves">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="gloves" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="gloves" />

-            </menu_item_call>

-            <menu_item_call

-             label="Undershirt"

-             layout="topleft"

-             name="Menu Undershirt">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="undershirt" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="undershirt" />

-            </menu_item_call>

-            <menu_item_call

-             label="Underpants"

-             layout="topleft"

-             name="Menu Underpants">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="underpants" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="underpants" />

-            </menu_item_call>

-            <menu_item_call

-             label="Skirt"

-             layout="topleft"

-             name="Skirt">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="skirt" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="skirt" />

-            </menu_item_call>

-            <menu_item_call

-             label="Alpha"

-             layout="topleft"

-             name="Alpha">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="alpha" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="alpha" />

-            </menu_item_call>

-            <menu_item_call

-             label="Tattoo"

-             layout="topleft"

-             name="Tattoo">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="tattoo" />

-                <menu_item_call.on_enable

-                 function="Edit.EnableTakeOff"

-                 parameter="tattoo" />

-            </menu_item_call>

-            <menu_item_call

-             label="All Clothes"

-             layout="topleft"

-             name="All Clothes">

-                <menu_item_call.on_click

-                 function="Edit.TakeOff"

-                 parameter="all" />

-            </menu_item_call>

-        </menu>

-        <menu_item_check

-         label="Show Toolbar"

-         layout="topleft"

-         name="Show Toolbar">

-            <menu_item_check.on_check

-             function="FloaterVisible"

-             parameter="toolbar" />

-            <menu_item_check.on_click

-             function="ShowFloater"

-             parameter="toolbar" />

-        </menu_item_check>

-        <menu

-         create_jump_keys="true"

-         label="Help"

-         layout="topleft"

-         name="Help"

-         tear_off="true">

-            <menu_item_call

-             label="Official Linden Blog"

-             layout="topleft"

-             name="Official Linden Blog">

-                <menu_item_call.on_click

-                 function="PromptShowURL"

-                 name="OfficialLindenBlog_url"

-                 parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" />

-            </menu_item_call>

-            <menu_item_call

-             label="Scripting Portal"

-             layout="topleft"

-             name="Scripting Portal">

-                <menu_item_call.on_click

-                 function="PromptShowURL"

-                 name="ScriptingPortal_url"

-                 parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />

-            </menu_item_call>

-            <menu

-             create_jump_keys="true"

-             label="Bug Reporting"

-             layout="topleft"

-             name="Bug Reporting"

-             tear_off="true">

-                <menu_item_call

-                 label="Public Issue Tracker"

-                 layout="topleft"

-                 name="Public Issue Tracker">

-                    <menu_item_call.on_click

-                     function="PromptShowURL"

-                     name="PublicIssueTracker_url"

-                     parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Public Issue Tracker Help"

-                 layout="topleft"

-                 name="Publc Issue Tracker Help">

-                    <menu_item_call.on_click

-                     function="PromptShowURL"

-                     name="PublicIssueTrackerHelp_url"

-                     parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />

-                </menu_item_call>

-                <menu_item_separator

-                 layout="topleft" />

-                <menu_item_call

-                 label="Bug Reporting 101"

-                 layout="topleft"

-                 name="Bug Reporing 101">

-                    <menu_item_call.on_click

-                     function="PromptShowURL"

-                     name="BugReporting101_url"

-                     parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Security Issues"

-                 layout="topleft"

-                 name="Security Issues">

-                    <menu_item_call.on_click

-                     function="PromptShowURL"

-                     name="SecurityIssues_url"

-                     parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />

-                </menu_item_call>

-                <menu_item_call

-                 label="QA Wiki"

-                 layout="topleft"

-                 name="QA Wiki">

-                    <menu_item_call.on_click

-                     function="PromptShowURL"

-                     name="QAWiki_url"

-                     parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />

-                </menu_item_call>

-            </menu>

-        </menu>

-    </menu>

-</menu_bar>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar
+ bg_visible="false"
+ follows="left|top|right"
+ layout="topleft"
+ name="Main Menu">
+    <menu
+     label="Me"
+     layout="topleft"
+     name="Me"
+     tear_off="true">
+        <menu_item_call
+         label="Preferences"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|P">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="preferences" />
+        </menu_item_call>
+         <menu_item_call
+             label="My Dashboard"
+             layout="topleft"
+             name="Manage My Account">
+                <menu_item_call.on_click
+                 function="PromptShowURL"
+                 name="ManageMyAccount_url"
+                 parameter="WebLaunchJoinNow,http://secondlife.com/account/" />
+      </menu_item_call>
+        <menu_item_call
+         label="Buy L$"
+         layout="topleft"
+         name="Buy and Sell L$">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="buy currency" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="My Profile"
+         layout="topleft"
+         name="Profile">
+            <menu_item_call.on_click
+             function="ShowAgentProfile"
+             parameter="agent" />
+        </menu_item_call>
+        <menu_item_call
+         label="My Appearance"
+         layout="topleft"
+         name="Appearance">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="appearance" />
+            <menu_item_call.on_enable
+             function="Edit.EnableCustomizeAvatar" />
+        </menu_item_call>
+        <menu_item_check
+         label="My Inventory"
+         layout="topleft"
+         name="Inventory"
+         shortcut="control|I">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="inventory" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="inventory" />
+        </menu_item_check>
+        <menu_item_call
+         label="My Gestures"
+         layout="topleft"
+         name="Gestures"
+         shortcut="control|G">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="gestures" />
+        </menu_item_call>
+        <menu
+         label="My Status"
+         layout="topleft"
+         name="Status"
+         tear_off="true">
+            <menu_item_call
+             label="Away"
+             layout="topleft"
+             name="Set Away">
+                <menu_item_call.on_click
+                 function="World.SetAway" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft"/>
+            <menu_item_call
+             label="Busy"
+             layout="topleft"
+             name="Set Busy">
+                <menu_item_call.on_click
+                 function="World.SetBusy"/>
+            </menu_item_call>
+        </menu>
+        <menu_item_call
+         label="Request Admin Status"
+         layout="topleft"
+         name="Request Admin Options"
+         shortcut="control|alt|G"
+		 visible="false">
+            <menu_item_call.on_click
+             function="Advanced.RequestAdminStatus" />
+        </menu_item_call>
+        <menu_item_call
+         label="Leave Admin Status"
+         layout="topleft"
+         name="Leave Admin Options"
+         shortcut="control|alt|shift|G"
+		 visible="false">
+            <menu_item_call.on_click
+             function="Advanced.LeaveAdminStatus" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Quit [APP_NAME]"
+         layout="topleft"
+         name="Quit"
+         shortcut="control|Q">
+            <menu_item_call.on_click
+             function="File.Quit" />
+        </menu_item_call>
+    </menu>
+    <menu
+     label="Communicate"
+     layout="topleft"
+     name="Communicate"
+     tear_off="true">
+        <menu_item_call
+         label="My Friends"
+         layout="topleft"
+         name="My Friends"
+         shortcut="control|shift|F">
+            <menu_item_call.on_click
+             function="SideTray.PanelPeopleTab"
+             parameter="friends_panel" />
+            </menu_item_call>
+        <menu_item_call
+         label="My Groups"
+         layout="topleft"
+         name="My Groups">
+            <menu_item_call.on_click
+             function="SideTray.PanelPeopleTab"
+             parameter="groups_panel" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <!--menu_item_call
+         label="Chat"
+         layout="topleft"
+         name="Chat">
+            <menu_item_call.on_click
+             function="World.Chat" />
+        </menu_item_call-->
+        <menu_item_check
+         label="Nearby Chat"
+         layout="topleft"
+         name="Nearby Chat"
+         shortcut="control|H">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="nearby_chat" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="nearby_chat" />
+        </menu_item_check>
+        <menu_item_call
+         label="Nearby People"
+         layout="topleft"
+         name="Active Speakers"
+         shortcut="control|shift|A">
+            <menu_item_call.on_click
+             function="SideTray.PanelPeopleTab"
+             parameter="nearby_panel" />
+            </menu_item_call>
+        <menu_item_check
+         label="Nearby Media"
+         layout="topleft"
+         name="Nearby Media"
+         shortcut="control|alt|N">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="nearby_media" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="nearby_media" />
+        </menu_item_check>
+        <!--menu_item_check
+         label="Block List"
+         layout="topleft"
+         name="Mute List">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="mute" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="mute" />
+        </menu_item_check-->
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_check
+         label="(Legacy) Communicate"
+         layout="topleft"
+         name="Instant Message"
+         shortcut="control|T">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="communicate" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="communicate" />
+        </menu_item_check>
+        <menu_item_call
+         label="(Temp) Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|alt|M">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
+        </menu_item_call>
+    </menu>
+    <menu
+     label="World"
+     layout="topleft"
+     name="World"
+     tear_off="true">
+         <menu_item_check
+         label="Move"
+         layout="topleft"
+         name="Movement Controls">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="moveview" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="moveview" />
+        </menu_item_check>
+        <menu_item_check
+         label="View"
+         layout="topleft"
+         name="Camera Controls">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="camera" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="camera" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="About Land"
+         layout="topleft"
+         name="About Land">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="about_land" />
+        </menu_item_call>
+        <menu_item_call
+         label="Region/Estate"
+         layout="topleft"
+         name="Region/Estate">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="region_info" />
+        </menu_item_call>
+        <menu_item_call
+             label="Buy Land"
+             layout="topleft"
+             name="Buy Land">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="buy land" />
+                <menu_item_call.on_enable
+                 function="World.EnableBuyLand" />
+            </menu_item_call>
+        <menu_item_call
+             label="My Land"
+             layout="topleft"
+             name="My Land">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="land_holdings" />
+        </menu_item_call>
+        <menu
+           create_jump_keys="true"
+           label="Show"
+           layout="topleft"
+           name="Land"
+           tear_off="true">
+          <menu_item_check
+             label="Ban Lines"
+             layout="topleft"
+             name="Ban Lines">
+            <menu_item_check.on_check
+               control="ShowBanLines" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowBanLines" />
+          </menu_item_check>
+           <menu_item_check
+                 label="Beacons"
+                 layout="topleft"
+                 name="beacons"
+                 shortcut="control|alt|shift|N">
+                    <menu_item_check.on_check
+                     function="Floater.Visible"
+                     parameter="beacons" />
+                    <menu_item_check.on_click
+                     function="Floater.Toggle"
+                     parameter="beacons" />
+                </menu_item_check>
+          <menu_item_check
+             label="Property Lines"
+             layout="topleft"
+             name="Property Lines"
+             shortcut="control|alt|shift|P">
+            <menu_item_check.on_check
+               control="ShowPropertyLines" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowPropertyLines" />
+          </menu_item_check>
+          <menu_item_check
+             label="Land Owners"
+             layout="topleft"
+             name="Land Owners">
+            <menu_item_check.on_check
+               control="ShowParcelOwners" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowParcelOwners" />
+          </menu_item_check>
+        </menu>
+        <menu_item_separator
+         layout="topleft" />
+        <menu
+         label="Landmarks"
+         layout="topleft"
+         name="Landmarks"
+         tear_off="true">
+            <menu_item_call
+             label="Create Landmark Here"
+             layout="topleft"
+             name="Create Landmark Here">
+                <menu_item_call.on_click
+                 function="World.CreateLandmark" />
+                <menu_item_call.on_enable
+                 function="World.EnableCreateLandmark" />
+            </menu_item_call>
+            <menu_item_call
+             label="Set Home to Here"
+             layout="topleft"
+             name="Set Home to Here">
+                <menu_item_call.on_click
+                 function="World.SetHomeLocation" />
+                <menu_item_call.on_enable
+                 function="World.EnableSetHomeLocation" />
+            </menu_item_call>
+            <menu_item_call
+             label="Teleport Home"
+             layout="topleft"
+             name="Teleport Home"
+             shortcut="control|shift|H">
+                <menu_item_call.on_click
+                 function="World.TeleportHome" />
+                <menu_item_call.on_enable
+                 function="World.EnableTeleportHome" />
+            </menu_item_call>
+        </menu>
+      <menu_item_check
+         label="Mini-Map"
+         layout="topleft"
+         name="Mini-Map"
+         shortcut="control|shift|M">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="mini_map" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="mini_map" />
+        </menu_item_check>
+         <menu_item_check
+         label="World Map"
+         layout="topleft"
+         name="World Map"
+         shortcut="control|M"
+         use_mac_ctrl="true">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="world_map" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="world_map" />
+        </menu_item_check>
+    <!--    <menu_item_check
+         label="Show Navigation Bar"
+         layout="topleft"
+         name="ShowNavbarNavigationPanel">
+           <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ShowNavbarNavigationPanel" />
+             <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ShowNavbarNavigationPanel" />
+        </menu_item_check>
+       <menu_item_check
+         label="Show Favorites Bar"
+         layout="topleft"
+         name="ShowNavbarFavoritesPanel">
+           <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ShowNavbarFavoritesPanel" />
+             <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ShowNavbarFavoritesPanel" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />-->
+        <menu_item_call
+         label="Snapshot"
+         layout="topleft"
+         name="Take Snapshot"
+         shortcut="control|shift|S">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="snapshot" />
+        </menu_item_call>
+    <menu
+         create_jump_keys="true"
+         label="Sun"
+         layout="topleft"
+         name="Environment Settings"
+         tear_off="true">
+            <menu_item_call
+             label="Sunrise"
+             layout="topleft"
+             name="Sunrise">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="sunrise" />
+            </menu_item_call>
+            <menu_item_call
+             label="Midday"
+             layout="topleft"
+             name="Noon"
+             shortcut="control|shift|Y">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="noon" />
+            </menu_item_call>
+            <menu_item_call
+             label="Sunset"
+             layout="topleft"
+             name="Sunset"
+             shortcut="control|shift|N">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="sunset" />
+            </menu_item_call>
+            <menu_item_call
+             label="Midnight"
+             layout="topleft"
+             name="Midnight">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="midnight" />
+            </menu_item_call>
+            <menu_item_call
+             label="Use the Estate Time"
+             layout="topleft"
+             name="Revert to Region Default">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="default" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Environment Editor"
+             layout="topleft"
+             name="Environment Editor">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="editor" />
+            </menu_item_call>
+        </menu>
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Build"
+     layout="topleft"
+     name="BuildTools"
+     tear_off="true"
+     visible="true">
+       <menu_item_check
+         label="Build"
+         layout="topleft"
+         name="Show Build Tools"
+         shortcut="control|B">
+            <menu_item_check.on_check
+             function="Build.Active" />
+            <menu_item_check.on_click
+             function="Build.Toggle" />
+            <menu_item_check.on_enable
+             function="Build.Enabled" />
+       </menu_item_check>
+       <menu
+          create_jump_keys="true"
+          label="Select Build Tool"
+          layout="topleft"
+          name="Select Tool"
+          tear_off="true">
+         <menu_item_call
+			label="Focus Tool"
+			layout="topleft"
+			name="Focus"
+			shortcut="control|1">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="focus" />
+         </menu_item_call>
+         <menu_item_call
+			label="Move Tool"
+			layout="topleft"
+			name="Move"
+			shortcut="control|2">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="move" />
+         </menu_item_call>
+         <menu_item_call
+			label="Edit Tool"
+			layout="topleft"
+			name="Edit"
+			shortcut="control|3">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="edit" />
+         </menu_item_call>
+         <menu_item_call
+			label="Create Tool"
+			layout="topleft"
+			name="Create"
+			shortcut="control|4">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="create" />
+         </menu_item_call>
+         <menu_item_call
+			label="Land Tool"
+			layout="topleft"
+			name="Land"
+			shortcut="control|5">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="land" />
+         </menu_item_call>
+	   </menu>
+        <menu
+         create_jump_keys="true"
+         label="Edit"
+         layout="topleft"
+         name="Edit"
+         tear_off="true">
+            <menu_item_call
+             label="Undo"
+             layout="topleft"
+             name="Undo"
+             shortcut="control|Z">
+                <menu_item_call.on_click
+                 function="Edit.Undo" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableUndo" />
+            </menu_item_call>
+            <menu_item_call
+             label="Redo"
+             layout="topleft"
+             name="Redo"
+             shortcut="control|Y">
+                <menu_item_call.on_click
+                 function="Edit.Redo" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableRedo" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Cut"
+             layout="topleft"
+             name="Cut"
+             shortcut="control|X">
+                <menu_item_call.on_click
+                 function="Edit.Cut" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableCut" />
+            </menu_item_call>
+            <menu_item_call
+             label="Copy"
+             layout="topleft"
+             name="Copy"
+             shortcut="control|C">
+                <menu_item_call.on_click
+                 function="Edit.Copy" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableCopy" />
+            </menu_item_call>
+            <menu_item_call
+             label="Paste"
+             layout="topleft"
+             name="Paste"
+             shortcut="control|V">
+                <menu_item_call.on_click
+                 function="Edit.Paste" />
+                <menu_item_call.on_enable
+                 function="Edit.EnablePaste" />
+            </menu_item_call>
+            <menu_item_call
+             label="Delete"
+             layout="topleft"
+             name="Delete"
+             shortcut="Del">
+                <menu_item_call.on_click
+                 function="Edit.Delete" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableDelete" />
+            </menu_item_call>
+            <menu_item_call
+             label="Duplicate"
+             layout="topleft"
+             name="Duplicate"
+             shortcut="control|D">
+                <menu_item_call.on_click
+                 function="Edit.Duplicate" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableDuplicate" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Select All"
+             layout="topleft"
+             name="Select All"
+             shortcut="control|A">
+                <menu_item_call.on_click
+                 function="Edit.SelectAll" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableSelectAll" />
+            </menu_item_call>
+            <menu_item_call
+             label="Deselect"
+             layout="topleft"
+             name="Deselect"
+             shortcut="control|E">
+                <menu_item_call.on_click
+                 function="Edit.Deselect" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableDeselect" />
+            </menu_item_call>
+        </menu>
+        <menu_item_separator
+           layout="topleft" />
+        <menu_item_call
+           label="Link"
+           layout="topleft"
+           name="Link"
+           shortcut="control|L">
+          <menu_item_call.on_click
+             function="Tools.Link" />
+          <menu_item_call.on_enable
+             function="Tools.EnableLink" />
+        </menu_item_call>
+        <menu_item_call
+           label="Unlink"
+           layout="topleft"
+           name="Unlink"
+           shortcut="control|shift|L">
+          <menu_item_call.on_click
+             function="Tools.Unlink" />
+          <menu_item_call.on_enable
+             function="Tools.EnableUnlink" />
+        </menu_item_call>
+        <menu_item_separator
+           layout="topleft" />
+        <menu_item_call
+           label="Focus on Selection"
+           layout="topleft"
+           name="Focus on Selection"
+           shortcut="H">
+          <menu_item_call.on_click
+             function="Tools.LookAtSelection"
+             parameter="focus" />
+          <menu_item_call.on_enable
+             function="Tools.SomethingSelectedNoHUD" />
+        </menu_item_call>
+        <menu_item_call
+           label="Zoom to Selection"
+           layout="topleft"
+           name="Zoom to Selection"
+           shortcut="shift|H">
+          <menu_item_call.on_click
+             function="Tools.LookAtSelection"
+             parameter="zoom" />
+          <menu_item_call.on_enable
+             function="Tools.SomethingSelectedNoHUD" />
+        </menu_item_call>
+        <menu_item_separator
+           layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Object"
+         layout="topleft"
+         name="Object"
+         tear_off="true">
+          <menu_item_call
+			 label="Buy"
+			 layout="topleft"
+			 name="Menu Object Take"
+			 visible="true">
+			<menu_item_call.on_click
+               function="Tools.BuyOrTake" />
+			<menu_item_call.on_enable
+               function="Tools.EnableBuyOrTake"
+               name="EnableBuyOrTake"
+               parameter="Buy,Take" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Take Copy"
+			 layout="topleft"
+			 name="Take Copy">
+			<menu_item_call.on_click
+               function="Tools.TakeCopy" />
+			<menu_item_call.on_enable
+               function="Tools.EnableTakeCopy" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Save Back to My Inventory"
+			 layout="topleft"
+			 name="Save Object Back to My Inventory">
+			<menu_item_call.on_click
+               function="Tools.SaveToInventory" />
+			<menu_item_call.on_enable
+               function="Tools.EnableSaveToInventory" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Save Back to Object Contents"
+			 layout="topleft"
+			 name="Save Object Back to Object Contents">
+			<menu_item_call.on_click
+               function="Tools.SaveToObjectInventory" />
+			<menu_item_call.on_enable
+               function="Tools.EnableSaveToObjectInventory" />
+          </menu_item_call>
+		</menu>
+        <menu
+           create_jump_keys="true"
+           label="Scripts"
+           layout="topleft"
+           name="Scripts"
+           tear_off="true">
+          <menu_item_call
+             label="Recompile Scripts (Mono)"
+             layout="topleft"
+             name="Mono">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="compile mono" />
+            <menu_item_call.on_enable
+               function="EditableSelectedMono" />
+          </menu_item_call>
+          <menu_item_call
+             label="Recompile Scripts (LSL)"
+             layout="topleft"
+             name="LSL">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="compile lsl" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Reset Scripts"
+             layout="topleft"
+             name="Reset Scripts">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="reset" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Set Scripts to Running"
+             layout="topleft"
+             name="Set Scripts to Running">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="start" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Set Scripts to Not Running"
+             layout="topleft"
+             name="Set Scripts to Not Running">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="stop" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+        </menu>
+        <menu_item_separator
+           layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Options"
+         layout="topleft"
+         name="Options"
+         tear_off="true">
+            <menu_item_check
+             label="Edit Linked Parts"
+             layout="topleft"
+             name="Edit Linked Parts">
+                <menu_item_check.on_check
+                 control="EditLinkedParts" />
+                <menu_item_check.on_click
+                 function="Tools.EditLinkedParts"
+                 parameter="EditLinkedParts" />
+                <menu_item_check.on_enable
+                 function="Tools.EnableToolNotPie" />
+            </menu_item_check>
+            <menu_item_call
+             label="Set Default Upload Permissions"
+             layout="topleft"
+             name="perm prefs">
+                <menu_item_call.on_click
+                 function="Floater.Toggle"
+                 parameter="perm_prefs" />
+            </menu_item_call>
+			<menu_item_check
+			   label="Show Advanced Permissions"
+			   layout="topleft"
+			   name="DebugPermissions">
+			  <menu_item_check.on_check
+				 function="CheckControl"
+				 parameter="DebugPermissions" />
+			  <menu_item_check.on_click
+				 function="ToggleControl"
+				 parameter="DebugPermissions" />
+			</menu_item_check>
+            <!--menu_item_call
+             label="Show Script Warning/Error Window"
+             layout="topleft"
+             name="Show Script Warning/Error Window">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="script errors" />
+            </menu_item_call-->
+            <menu_item_separator
+             layout="topleft" />
+            <menu
+             create_jump_keys="true"
+             label="Selection"
+             layout="topleft"
+             name="Selection"
+             tear_off="true">
+                <menu_item_check
+                 label="Select Only My Objects"
+                 layout="topleft"
+                 name="Select Only My Objects">
+                    <menu_item_check.on_check
+                     control="SelectOwnedOnly" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectOnlyMyObjects"
+                     parameter="agents" />
+                </menu_item_check>
+                <menu_item_check
+                 label="Select Only Movable Objects"
+                 layout="topleft"
+                 name="Select Only Movable Objects">
+                    <menu_item_check.on_check
+                     control="SelectMovableOnly" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectOnlyMovableObjects"
+                     parameter="movable" />
+                </menu_item_check>
+                <menu_item_check
+                 label="Select By Surrounding"
+                 layout="topleft"
+                 name="Select By Surrounding">
+                    <menu_item_check.on_check
+                     control="RectangleSelectInclusive" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectBySurrounding" />
+                </menu_item_check>
+            </menu>
+            <menu
+             create_jump_keys="true"
+             label="Show"
+             layout="topleft"
+             name="Show"
+             tear_off="true">
+                <menu_item_check
+                 label="Show Hidden Selection"
+                 layout="topleft"
+                 name="Show Hidden Selection">
+                    <menu_item_check.on_check
+                     control="RenderHiddenSelections" />
+                    <menu_item_check.on_click
+                     function="Tools.ShowHiddenSelection" />
+                </menu_item_check>
+                <menu_item_check
+                 label="Show Light Radius for Selection"
+                 layout="topleft"
+                 name="Show Light Radius for Selection">
+                    <menu_item_check.on_check
+                     control="RenderLightRadius" />
+                    <menu_item_check.on_click
+                     function="Tools.ShowSelectionLightRadius" />
+                </menu_item_check>
+                <menu_item_check
+                 label="Show Selection Beam"
+                 layout="topleft"
+                 name="Show Selection Beam">
+                    <menu_item_check.on_check
+                     control="ShowSelectionBeam" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="ShowSelectionBeam" />
+                </menu_item_check>
+            </menu>
+            <menu
+             create_jump_keys="true"
+             label="Grid"
+             layout="topleft"
+             name="Grid"
+             tear_off="true">
+                <menu_item_check
+                 label="Snap to Grid"
+                 layout="topleft"
+                 name="Snap to Grid"
+                 shortcut="G">
+                    <menu_item_check.on_check
+                     control="SnapEnabled" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="SnapEnabled" />
+                    <menu_item_check.on_enable
+                     function="Tools.EnableToolNotPie" />
+                </menu_item_check>
+                <menu_item_call
+                 label="Snap Object XY to Grid"
+                 layout="topleft"
+                 name="Snap Object XY to Grid"
+                 shortcut="shift|X">
+                    <menu_item_call.on_click
+                     function="Tools.SnapObjectXY" />
+                    <menu_item_call.on_enable
+                     function="Tools.EnableToolNotPie" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Use Selection for Grid"
+                 layout="topleft"
+                 name="Use Selection for Grid"
+                 shortcut="shift|G">
+                    <menu_item_call.on_click
+                     function="Tools.UseSelectionForGrid" />
+                    <menu_item_call.on_enable
+                     function="SomethingSelected" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Grid Options"
+                 layout="topleft"
+                 name="Grid Options"
+                 shortcut="control|shift|B">
+                    <menu_item_call.on_click
+                     function="Floater.Show"
+                     parameter="build_options" />
+                    <menu_item_call.on_enable
+                     function="Tools.EnableToolNotPie" />
+                </menu_item_call>
+            </menu>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Select Linked Parts"
+         layout="topleft"
+         name="Select Linked Parts"
+         tear_off="true">
+            <menu_item_call
+             label="Select Next Part"
+             layout="topleft"
+             name="Select Next Part"
+	     shortcut="control|.">
+                <menu_item_call.on_click
+                 function="Tools.SelectNextPart"
+                 parameter="next" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableSelectNextPart" />
+            </menu_item_call>
+            <menu_item_call
+             label="Select Previous Part"
+             layout="topleft"
+             name="Select Previous Part"
+	     shortcut="control|,">
+                <menu_item_call.on_click
+                 function="Tools.SelectNextPart"
+                 parameter="previous" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableSelectNextPart" />
+            </menu_item_call>
+            <menu_item_call
+             label="Include Next Part"
+             layout="topleft"
+             name="Include Next Part"
+	     shortcut="control|shift|.">
+                <menu_item_call.on_click
+                 function="Tools.SelectNextPart"
+                 parameter="includenext" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableSelectNextPart" />
+            </menu_item_call>
+            <menu_item_call
+             label="Include Previous Part"
+             layout="topleft"
+             name="Include Previous Part"
+	     shortcut="control|shift|,">
+                <menu_item_call.on_click
+                 function="Tools.SelectNextPart"
+                 parameter="includeprevious" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableSelectNextPart" />
+            </menu_item_call>
+        </menu>
+    </menu>
+    <menu
+     label="Help"
+     layout="topleft"
+     name="Help"
+     tear_off="true">
+        <menu_item_call
+         label="[SECOND_LIFE] Help"
+         layout="topleft"
+         name="Second Life Help"
+         shortcut="F1">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="help f1" />
+        </menu_item_call>
+        <menu_item_call
+         label="Tutorial"
+         layout="topleft"
+         name="Tutorial">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="hud" />
+        </menu_item_call>
+        <menu_item_separator
+             layout="topleft" />
+        <menu_item_call
+             label="Report Abuse"
+             layout="topleft"
+             name="Report Abuse">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="complaint reporter" />
+            </menu_item_call>
+        <menu_item_separator
+             layout="topleft" />
+        <menu_item_call
+         label="About [APP_NAME]"
+         layout="topleft"
+         name="About Second Life">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="sl_about" />
+        </menu_item_call>
+    </menu>
+    <menu
+     label="Advanced"
+     layout="topleft"
+     name="Advanced"
+     tear_off="true"
+     visible="false">
+        <menu_item_check
+         label="Set Away After 30 Minutes"
+         layout="topleft"
+         name="Go Away/AFK When Idle">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="AllowIdleAFK" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="AllowIdleAFK" />
+        </menu_item_check>
+        <menu_item_call
+         label="Stop Animating Me"
+         layout="topleft"
+         name="Stop Animating My Avatar">
+            <menu_item_call.on_click
+             function="Tools.StopAllAnimations" />
+        </menu_item_call>
+        <menu_item_call
+         label="Rebake Textures"
+         layout="topleft"
+         name="Rebake Texture"
+         shortcut="control|alt|R">
+            <menu_item_call.on_click
+             function="Advanced.RebakeTextures" />
+        </menu_item_call>
+        <menu_item_call
+           label="Set UI Size to Default"
+           layout="topleft"
+           name="Set UI Size to Default">
+          <menu_item_call.on_click
+             function="View.DefaultUISize" />
+        </menu_item_call>
+        <menu_item_separator/>
+        <menu_item_check
+         label="Limit Select Distance"
+         layout="topleft"
+         name="Limit Select Distance">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="LimitSelectDistance" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="LimitSelectDistance" />
+        </menu_item_check>
+        <menu_item_check
+         label="Disable Camera Constraints"
+         layout="topleft"
+         name="Disable Camera Distance">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="DisableCameraConstraints" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="DisableCameraConstraints" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_check
+         label="High-res Snapshot"
+         layout="topleft"
+         name="HighResSnapshot">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="HighResSnapshot" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="HighResSnapshot" />
+        </menu_item_check>
+        <menu_item_check
+         label="Quiet Snapshots to Disk"
+         layout="topleft"
+         name="QuietSnapshotsToDisk">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="QuietSnapshotsToDisk" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="QuietSnapshotsToDisk" />
+        </menu_item_check>
+        <menu_item_check
+         label="Compress Snapshots to Disk"
+         layout="topleft"
+         name="CompressSnapshotsToDisk">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="CompressSnapshotsToDisk" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="CompressSnapshotsToDisk" />
+        </menu_item_check>
+        <menu_item_call
+         label="Save Texture As"
+         layout="topleft"
+         name="Save Texture As">
+            <menu_item_call.on_click
+             function="File.SaveTexture" />
+            <menu_item_call.on_enable
+             function="File.EnableSaveAs" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Performance Tools"
+         layout="topleft"
+         name="Performance Tools"
+         tear_off="true">
+            <menu_item_call
+             label="Lag Meter"
+             layout="topleft"
+             name="Lag Meter">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="lagmeter" />
+            </menu_item_call>
+            <menu_item_check
+             label="Statistics Bar"
+             layout="topleft"
+             name="Statistics Bar"
+             shortcut="control|shift|1">
+                <menu_item_check.on_check
+                 function="Floater.Visible"
+                 parameter="stats" />
+                <menu_item_check.on_click
+                 function="Floater.Toggle"
+                 parameter="stats" />
+            </menu_item_check>
+      <menu_item_check
+        label="Show Avatar Rendering Cost"
+        layout="topleft"
+        name="Avatar Rendering Cost">
+           <menu_item_check.on_check
+            function="Advanced.CheckInfoDisplay"
+            parameter="shame" />
+           <menu_item_check.on_click
+            function="Advanced.ToggleInfoDisplay"
+            parameter="shame" />
+       </menu_item_check>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Highlighting and Visibility"
+         layout="topleft"
+         name="Highlighting and Visibility"
+         tear_off="true">
+         <menu_item_check
+                 label="Cheesy Beacon"
+                 layout="topleft"
+                 name="Cheesy Beacon">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="CheesyBeacon" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="CheesyBeacon" />
+                </menu_item_check>
+            <menu_item_check
+             label="Hide Particles"
+             layout="topleft"
+             name="Hide Particles"
+             shortcut="control|alt|shift|=">
+                <menu_item_check.on_check
+                 function="View.CheckRenderType"
+                 parameter="hideparticles" />
+                <menu_item_check.on_click
+                 function="View.ToggleRenderType"
+                 parameter="hideparticles" />
+            </menu_item_check>
+            <menu_item_check
+             label="Hide Selected"
+             layout="topleft"
+             name="Hide Selected">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="HideSelectedObjects" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="HideSelectedObjects" />
+            </menu_item_check>
+            <menu_item_check
+             label="Highlight Transparent"
+             layout="topleft"
+             name="Highlight Transparent"
+             shortcut="control|alt|T">
+                <menu_item_check.on_check
+                 function="View.CheckHighlightTransparent" />
+                <menu_item_check.on_click
+                 function="View.HighlightTransparent" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show HUD Attachments"
+             layout="topleft"
+             name="Show HUD Attachments"
+             shortcut="alt|shift|H">
+                <menu_item_check.on_check
+                 function="View.CheckHUDAttachments" />
+                <menu_item_check.on_click
+                 function="View.ShowHUDAttachments" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Mouselook Crosshairs"
+             layout="topleft"
+             name="ShowCrosshairs">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="ShowCrosshairs" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="ShowCrosshairs" />
+            </menu_item_check>
+  <!-- <menu
+         create_jump_keys="true"
+         label="Hover Tips"
+         layout="topleft"
+         name="Hover Tips"
+         tear_off="true">
+            <menu_item_check
+             label="Show Tips"
+             layout="topleft"
+             name="Show Tips"
+             shortcut="control|shift|T">
+                <menu_item_check.on_check
+                 function="View.CheckShowHoverTips" />
+                <menu_item_check.on_click
+                 function="View.ShowHoverTips" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />-->
+            <menu_item_check
+             label="Show Land Tooltips"
+             layout="topleft"
+             name="Land Tips">
+                <menu_item_check.on_check
+                 control="ShowLandHoverTip" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="ShowLandHoverTip" />
+                <menu_item_check.on_enable
+                 function="View.CheckShowHoverTips" />
+            </menu_item_check>
+ <!--           <menu_item_check
+             label="Show Tips On All Objects"
+             layout="topleft"
+             name="Tips On All Objects">
+                <menu_item_check.on_check
+                 control="ShowAllObjectHoverTip" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="ShowAllObjectHoverTip" />
+                <menu_item_check.on_enable
+                 function="View.CheckShowHoverTips" />
+            </menu_item_check>
+        </menu>-->
+
+        </menu>
+
+        <menu
+         create_jump_keys="true"
+         label="Rendering Types"
+         layout="topleft"
+         name="Rendering Types"
+         tear_off="true">
+            <menu_item_check
+             label="Simple"
+             layout="topleft"
+             name="Simple"
+             shortcut="control|alt|shift|1">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="simple" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="simple" />
+            </menu_item_check>
+            <menu_item_check
+             label="Alpha"
+             layout="topleft"
+             name="Alpha"
+             shortcut="control|alt|shift|2">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="alpha" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="alpha" />
+            </menu_item_check>
+            <menu_item_check
+             label="Tree"
+             layout="topleft"
+             name="Tree"
+             shortcut="control|alt|shift|3">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="tree" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="tree" />
+            </menu_item_check>
+            <menu_item_check
+             label="Avatars"
+             layout="topleft"
+             name="Character"
+             shortcut="control|alt|shift|4">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="character" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="character" />
+            </menu_item_check>
+            <menu_item_check
+             label="SurfacePath"
+             layout="topleft"
+             name="SurfacePath"
+             shortcut="control|alt|shift|5">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="surfacePath" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="surfacePath" />
+            </menu_item_check>
+            <menu_item_check
+             label="Sky"
+             layout="topleft"
+             name="Sky"
+             shortcut="control|alt|shift|6">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="sky" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="sky" />
+            </menu_item_check>
+            <menu_item_check
+             label="Water"
+             layout="topleft"
+             name="Water"
+             shortcut="control|alt|shift|7">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="water" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="water" />
+            </menu_item_check>
+            <menu_item_check
+             label="Ground"
+             layout="topleft"
+             name="Ground"
+             shortcut="control|alt|shift|8">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="ground" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="ground" />
+            </menu_item_check>
+            <menu_item_check
+             label="Volume"
+             layout="topleft"
+             name="Volume"
+             shortcut="control|alt|shift|9">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="volume" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="volume" />
+            </menu_item_check>
+            <menu_item_check
+             label="Grass"
+             layout="topleft"
+             name="Grass"
+             shortcut="control|alt|shift|0">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="grass" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="grass" />
+            </menu_item_check>
+            <menu_item_check
+             label="Clouds"
+             layout="topleft"
+             name="Clouds"
+             shortcut="control|alt|shift|-">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="clouds" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="clouds" />
+            </menu_item_check>
+            <menu_item_check
+             label="Particles"
+             layout="topleft"
+             name="Particles"
+             shortcut="control|alt|shift|=">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="particles" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="particles" />
+            </menu_item_check>
+            <menu_item_check
+             label="Bump"
+             layout="topleft"
+             name="Bump"
+             shortcut="control|alt|shift|\">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="bump" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="bump" />
+            </menu_item_check>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Rendering Features"
+         layout="topleft"
+         name="Rendering Features"
+         tear_off="true">
+            <menu_item_check
+             label="UI"
+             layout="topleft"
+             name="UI"
+             shortcut="control|alt|F1">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="ui" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="ui" />
+            </menu_item_check>
+            <menu_item_check
+             label="Selected"
+             layout="topleft"
+             name="Selected"
+             shortcut="control|alt|F2">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="selected" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="selected" />
+            </menu_item_check>
+            <menu_item_check
+             label="Highlighted"
+             layout="topleft"
+             name="Highlighted"
+             shortcut="control|alt|F3">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="highlighted" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="highlighted" />
+            </menu_item_check>
+            <menu_item_check
+             label="Dynamic Textures"
+             layout="topleft"
+             name="Dynamic Textures"
+             shortcut="control|alt|F4">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="dynamic textures" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="dynamic textures" />
+            </menu_item_check>
+            <menu_item_check
+             label="Foot Shadows"
+             layout="topleft"
+             name="Foot Shadows"
+             shortcut="control|alt|F5">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="foot shadows" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="foot shadows" />
+            </menu_item_check>
+            <menu_item_check
+             label="Fog"
+             layout="topleft"
+             name="Fog"
+             shortcut="control|alt|F6">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="fog" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="fog" />
+            </menu_item_check>
+            <menu_item_check
+             label="Test FRInfo"
+             layout="topleft"
+             name="Test FRInfo"
+             shortcut="control|alt|F8">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="fr info" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="fr info" />
+            </menu_item_check>
+            <menu_item_check
+             label="Flexible Objects"
+             layout="topleft"
+             name="Flexible Objects"
+             shortcut="control|alt|F9">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFeature"
+                 parameter="flexible" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFeature"
+                 parameter="flexible" />
+            </menu_item_check>
+        </menu>
+        <menu_item_check
+         label="Run Multiple Threads"
+         layout="topleft"
+         name="Run Multiple Threads">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RunMultipleThreads" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RunMultipleThreads" />
+        </menu_item_check>
+        <menu_item_call
+         label="Clear Group Cache"
+         layout="topleft"
+         name="ClearGroupCache">
+            <menu_item_call.on_click
+             function="Advanced.ClearGroupCache"
+             parameter="ClearGroupCache" />
+        </menu_item_call>
+        <menu_item_check
+         label="Mouse Smoothing"
+         layout="topleft"
+         name="Mouse Smoothing">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="MouseSmooth" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="MouseSmooth" />
+        </menu_item_check>
+        <menu_item_check
+         label="Show IMs in Nearby Chat"
+         layout="topleft"
+         name="IMInChat">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="IMInChat" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="IMInChat" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu
+         label="Shortcuts"
+         layout="topleft"
+         name="Shortcuts"
+         tear_off="true"
+         visible="false">
+            <menu_item_check
+               label="Search"
+               layout="topleft"
+               name="Search"
+               shortcut="control|F">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="search" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="search" />
+            </menu_item_check>
+            <menu_item_call
+             enabled="false"
+             label="Release Keys"
+             layout="topleft"
+             name="Release Keys">
+                <menu_item_call.on_click
+                 function="Tools.ReleaseKeys"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableReleaseKeys"
+                 parameter="" />
+            </menu_item_call>
+            <menu_item_call
+             label="Set UI Size to Default"
+             layout="topleft"
+             name="Set UI Size to Default">
+                <menu_item_call.on_click
+                 function="View.DefaultUISize" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_check
+             label="Always Run"
+             layout="topleft"
+             name="Always Run"
+             shortcut="control|R">
+                <menu_item_check.on_check
+                 function="World.CheckAlwaysRun" />
+                <menu_item_check.on_click
+                 function="World.AlwaysRun" />
+            </menu_item_check>
+            <menu_item_check
+             label="Fly"
+             layout="topleft"
+             name="Fly"
+             shortcut="Home">
+                <menu_item_check.on_click
+                 function="Agent.toggleFlying" />
+                <menu_item_check.on_enable
+                 function="Agent.enableFlying" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Close Window"
+             layout="topleft"
+             name="Close Window"
+             shortcut="control|W">
+                <menu_item_call.on_click
+                 function="File.CloseWindow" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseWindow" />
+            </menu_item_call>
+            <menu_item_call
+             label="Close All Windows"
+             layout="topleft"
+             name="Close All Windows"
+             shortcut="control|shift|W">
+                <menu_item_call.on_click
+                 function="File.CloseAllWindows" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseAllWindows" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Snapshot to Disk"
+             layout="topleft"
+             name="Snapshot to Disk"
+             shortcut="control|`"
+             use_mac_ctrl="true">
+                <menu_item_call.on_click
+                 function="File.TakeSnapshotToDisk" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Mouselook"
+             layout="topleft"
+             name="Mouselook"
+             shortcut="M">
+                <menu_item_call.on_click
+                 function="View.Mouselook" />
+                <menu_item_call.on_enable
+                 function="View.EnableMouselook" />
+            </menu_item_call>
+            <menu_item_check
+             label="Joystick Flycam"
+             layout="topleft"
+             name="Joystick Flycam"
+             shortcut="alt|shift|F">
+                <menu_item_check.on_check
+                 function="View.CheckJoystickFlycam" />
+                <menu_item_check.on_click
+                 function="View.JoystickFlycam" />
+                <menu_item_check.on_enable
+                 function="View.EnableJoystickFlycam" />
+            </menu_item_check>
+            <menu_item_call
+             label="Reset View"
+             layout="topleft"
+             name="Reset View"
+             shortcut="Esc">
+                <menu_item_call.on_click
+                 function="View.ResetView" />
+            </menu_item_call>
+            <menu_item_call
+             label="Look at Last Chatter"
+             layout="topleft"
+             name="Look at Last Chatter"
+             shortcut="control|\">
+                <menu_item_call.on_click
+                 function="View.LookAtLastChatter" />
+                <menu_item_call.on_enable
+                 function="View.EnableLastChatter" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu
+             create_jump_keys="true"
+             label="Select Build Tool"
+             layout="topleft"
+             name="Select Tool"
+             tear_off="true">
+                <menu_item_call
+                 label="Focus Tool"
+                 layout="topleft"
+                 name="Focus"
+                 shortcut="control|1">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="focus" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Move Tool"
+                 layout="topleft"
+                 name="Move"
+                 shortcut="control|2">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="move" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Edit Tool"
+                 layout="topleft"
+                 name="Edit"
+                 shortcut="control|3">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="edit" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Create Tool"
+                 layout="topleft"
+                 name="Create"
+                 shortcut="control|4">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="create" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Land Tool"
+                 layout="topleft"
+                 name="Land"
+                 shortcut="control|5">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="land" />
+                </menu_item_call>
+            </menu>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Zoom In"
+             layout="topleft"
+             name="Zoom In"
+             shortcut="control|0">
+                <menu_item_call.on_click
+                 function="View.ZoomIn" />
+            </menu_item_call>
+            <menu_item_call
+             label="Zoom Default"
+             layout="topleft"
+             name="Zoom Default"
+             shortcut="control|9">
+                <menu_item_call.on_click
+                 function="View.ZoomDefault" />
+            </menu_item_call>
+            <menu_item_call
+             label="Zoom Out"
+             layout="topleft"
+             name="Zoom Out"
+             shortcut="control|8">
+                <menu_item_call.on_click
+                 function="View.ZoomOut" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Toggle Fullscreen"
+             layout="topleft"
+             name="Toggle Fullscreen"
+             >
+               <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
+                <menu_item_call.on_click
+                 function="View.Fullscreen" />
+            </menu_item_call>
+        </menu>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Show Debug Settings"
+         layout="topleft"
+         name="Debug Settings">
+            <menu_item_call.on_click
+             function="Advanced.ShowDebugSettings"
+             parameter="all" />
+        </menu_item_call>
+     <menu_item_check
+         label="Show Develop Menu"
+         layout="topleft"
+         name="Debug Mode"
+         shortcut="control|alt|Q">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="QAMode" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="QAMode" />
+        </menu_item_check>
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Develop"
+     layout="topleft"
+     name="Develop"
+     tear_off="true"
+     visible="false">
+        <menu
+         create_jump_keys="true"
+         label="Consoles"
+         layout="topleft"
+         name="Consoles"
+         tear_off="true">
+            <menu_item_check
+             label="Texture Console"
+             layout="topleft"
+             name="Texture Console"
+             shortcut="control|shift|3"
+             use_mac_ctrl="true">
+                <menu_item_check.on_check
+                 function="Advanced.CheckConsole"
+                 parameter="texture" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleConsole"
+                 parameter="texture" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Console"
+             layout="topleft"
+             name="Debug Console"
+             shortcut="control|shift|4"
+             use_mac_ctrl="true">
+                <menu_item_check.on_check
+                 function="Advanced.CheckConsole"
+                 parameter="debug" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleConsole"
+                 parameter="debug" />
+            </menu_item_check>
+            <menu_item_call
+             label="Notifications Console"
+             layout="topleft"
+             name="Notifications"
+             shortcut="control|shift|5">
+              <menu_item_call.on_click
+               function="Floater.Toggle"
+               parameter="notifications_console" />
+            </menu_item_call>
+            <menu_item_check
+               label="Texture Size Console"
+               layout="topleft"
+               name="Texture Size"
+               shortcut="control|shift|6">
+              <menu_item_check.on_check
+               function="Advanced.CheckConsole"
+               parameter="texture size" />
+              <menu_item_check.on_click
+               function="Advanced.ToggleConsole"
+               parameter="texture size" />
+            </menu_item_check>
+            <menu_item_check
+               label="Texture Category Console"
+               layout="topleft"
+               name="Texture Category"
+               shortcut="control|shift|7">
+              <menu_item_check.on_check
+               function="Advanced.CheckConsole"
+               parameter="texture category" />
+              <menu_item_check.on_click
+               function="Advanced.ToggleConsole"
+               parameter="texture category" />
+            </menu_item_check>
+            <menu_item_check
+             label="Fast Timers"
+             layout="topleft"
+             name="Fast Timers"
+             shortcut="control|shift|9"
+             use_mac_ctrl="true">
+                <menu_item_check.on_check
+                 function="Advanced.CheckConsole"
+                 parameter="fast timers" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleConsole"
+                 parameter="fast timers" />
+            </menu_item_check>
+            <menu_item_check
+             label="Memory"
+             layout="topleft"
+             name="Memory"
+             shortcut="control|shift|0"
+             use_mac_ctrl="true">
+                <menu_item_check.on_check
+                 function="Advanced.CheckConsole"
+                 parameter="memory view" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleConsole"
+                 parameter="memory view" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Region Info to Debug Console"
+             layout="topleft"
+             name="Region Info to Debug Console">
+                <menu_item_call.on_click
+                 function="Advanced.DumpInfoToConsole"
+                 parameter="region" />
+            </menu_item_call>
+            <menu_item_call
+             label="Group Info to Debug Console"
+             layout="topleft"
+             name="Group Info to Debug Console">
+                <menu_item_call.on_click
+                 function="Advanced.DumpInfoToConsole"
+                 parameter="group" />
+            </menu_item_call>
+            <menu_item_call
+             label="Capabilities Info to Debug Console"
+             layout="topleft"
+             name="Capabilities Info to Debug Console">
+                <menu_item_call.on_click
+                 function="Advanced.DumpInfoToConsole"
+                 parameter="capabilities" />
+            </menu_item_call>
+            <menu_item_separator
+         layout="topleft" />
+            <menu_item_check
+             label="Camera"
+             layout="topleft"
+             name="Camera">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="camera" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="camera" />
+            </menu_item_check>
+            <menu_item_check
+             label="Wind"
+             layout="topleft"
+             name="Wind">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="wind" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="wind" />
+            </menu_item_check>
+            <menu_item_check
+             label="FOV"
+             layout="topleft"
+             name="FOV">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="fov" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="fov" />
+            </menu_item_check>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Show Info"
+         layout="topleft"
+         name="Display Info"
+         tear_off="true">
+            <menu_item_check
+             label="Show Time"
+             layout="topleft"
+             name="Show Time">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowTime" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowTime" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Render Info"
+             layout="topleft"
+             name="Show Render Info">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowRenderInfo" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowRenderInfo" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Matrices"
+             layout="topleft"
+             name="Show Matrices">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowRenderMatrices" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowRenderMatrices" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Color Under Cursor"
+             layout="topleft"
+             name="Show Color Under Cursor">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowColor" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowColor" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_check
+             label="Show Updates to Objects"
+             layout="topleft"
+             name="Show Updates"
+             shortcut="control|alt|shift|U">
+                <menu_item_check.on_check
+                 function="Advanced.CheckShowObjectUpdates"
+                 parameter="ObjectUpdates" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleShowObjectUpdates" />
+            </menu_item_check>
+        </menu>
+        <menu_item_separator
+         layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Force an Error"
+         layout="topleft"
+         name="Force Errors"
+         tear_off="true">
+            <menu_item_call
+             label="Force Breakpoint"
+             layout="topleft"
+             name="Force Breakpoint"
+             shortcut="control|alt|shift|B">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorBreakpoint" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force LLError And Crash"
+             layout="topleft"
+             name="Force LLError And Crash">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorLlerror" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Bad Memory Access"
+             layout="topleft"
+             name="Force Bad Memory Access">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorBadMemoryAccess" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Infinite Loop"
+             layout="topleft"
+             name="Force Infinite Loop">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorInfiniteLoop" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Driver Crash"
+             layout="topleft"
+             name="Force Driver Carsh">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorDriverCrash" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Software Exception"
+             layout="topleft"
+             name="Force Software Exception">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorSoftwareException" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Disconnect Viewer"
+             layout="topleft"
+             name="Force Disconnect Viewer">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorDisconnectViewer" />
+            </menu_item_call>
+            <menu_item_call
+             label="Simulate a Memory Leak"
+             layout="topleft"
+             name="Memory Leaking Simulation">
+               <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="mem_leaking" />
+               </menu_item_call>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Render Tests"
+         layout="topleft"
+         name="Render Tests"
+         tear_off="true">
+            <menu_item_check
+             label="Camera Offset"
+             layout="topleft"
+             name="Camera Offset">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="CameraOffset" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="CameraOffset" />
+            </menu_item_check>
+            <menu_item_check
+             label="Randomize Framerate"
+             layout="topleft"
+             name="Randomize Framerate">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRandomizeFramerate"
+                 parameter="Randomize Framerate" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRandomizeFramerate" />
+            </menu_item_check>
+            <menu_item_check
+             label="Periodic Slow Frame"
+             layout="topleft"
+             name="Periodic Slow Frame">
+                <menu_item_check.on_check
+                 function="Advanced.CheckPeriodicSlowFrame"
+                 parameter="points" />
+                <menu_item_check.on_click
+                 function="Advanced.TogglePeriodicSlowFrame"
+                 parameter="points" />
+            </menu_item_check>
+            <menu_item_check
+             label="Frame Test"
+             layout="topleft"
+             name="Frame Test">
+                <menu_item_check.on_check
+                 function="Advanced.CheckFrameTest"
+                 parameter="Frame Test" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleFrameTest" />
+            </menu_item_check>
+        </menu>
+      <menu
+        create_jump_keys="true"
+        label="Render Metadata"
+        layout="topleft"
+        name="Render Metadata"
+        tear_off="true">
+        <menu_item_check
+         label="Bounding Boxes"
+         layout="topleft"
+         name="Bounding Boxes">
+        <menu_item_check.on_check
+         function="Advanced.CheckInfoDisplay"
+         parameter="bboxes" />
+        <menu_item_check.on_click
+         function="Advanced.ToggleInfoDisplay"
+         parameter="bboxes" />
+        </menu_item_check>
+        <menu_item_check
+         label="Octree"
+         layout="topleft"
+         name="Octree">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="octree" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="octree" />
+        </menu_item_check>
+        <menu_item_check
+         label="Shadow Frusta"
+         layout="topleft"
+         name="Shadow Frusta">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="shadow frusta" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="shadow frusta" />
+        </menu_item_check>
+        <menu_item_check
+         label="Occlusion"
+         layout="topleft"
+         name="Occlusion">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="occlusion" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="occlusion" />
+        </menu_item_check>
+        <menu_item_check
+         label="Render Batches"
+         layout="topleft"
+         name="Render Batches">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="render batches" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="render batches" />
+        </menu_item_check>
+        <menu_item_check
+         label="Texture Anim"
+         layout="topleft"
+         name="Texture Anim">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="texture anim" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="texture anim" />
+        </menu_item_check>
+        <menu_item_check
+         label="Texture Priority"
+         layout="topleft"
+         name="Texture Priority">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="texture priority" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="texture priority" />
+        </menu_item_check>
+        <menu_item_check
+         label="Texture Area"
+         layout="topleft"
+         name="Texture Area">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="texture area" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="texture area" />
+        </menu_item_check>
+        <menu_item_check
+         label="Face Area"
+         layout="topleft"
+         name="Face Area">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="face area" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="face area" />
+        </menu_item_check>
+        <menu_item_check
+         label="Lights"
+         layout="topleft"
+         name="Lights">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="lights" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="lights" />
+        </menu_item_check>
+        <menu_item_check
+         label="Collision Skeleton"
+         layout="topleft"
+         name="Collision Skeleton">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="collision skeleton" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="collision skeleton" />
+        </menu_item_check>
+        <menu_item_check
+         label="Raycast"
+         layout="topleft"
+         name="Raycast">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="raycast" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="raycast" />
+        </menu_item_check>
+      </menu>
+        <menu
+         create_jump_keys="true"
+         label="Rendering"
+         layout="topleft"
+         name="Rendering"
+         tear_off="true">
+            <menu_item_check
+             label="Axes"
+             name="Axes">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="ShowAxes" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="ShowAxes" />
+            </menu_item_check>
+            <menu_item_check
+             label="Tangent Basis"
+             name="Tangent Basis">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="ShowTangentBasis" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="ShowTangentBasis" />
+            </menu_item_check>
+            <menu_item_call
+             label="Selected Texture Info Basis"
+             name="Selected Texture Info Basis"
+             shortcut="control|alt|shift|T">
+                <menu_item_call.on_click
+                 function="Advanced.SelectedTextureInfo" />
+            </menu_item_call>
+            <menu_item_check
+             label="Wireframe"
+             name="Wireframe"
+             shortcut="control|shift|R">
+                <menu_item_check.on_check
+                 function="Advanced.CheckWireframe"
+                 parameter="Wireframe" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleWireframe" />
+            </menu_item_check>
+            <menu_item_check
+             label="Object-Object Occlusion"
+             name="Object-Object Occlusion"
+             shortcut="control|shift|O">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="UseOcclusion" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="UseOcclusion" />
+                <menu_item_check.on_enable
+                 function="Advanced.EnableObjectObjectOcclusion" />
+            </menu_item_check>
+          <menu_item_check
+             label="Framebuffer Objects"
+             name="Framebuffer Objects">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderUseFBO" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RenderUseFBO" />
+            <menu_item_check.on_enable
+                 function="Advanced.EnableRenderFBO" />
+           </menu_item_check>
+          <menu_item_check
+                       label="Deferred Rendering"
+                       name="Deferred Rendering">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderDeferred" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RenderDeferred" />
+            <menu_item_check.on_enable
+                 function="Advanced.EnableRenderDeferred" />
+          </menu_item_check>
+          <menu_item_check
+                   label="Global Illumination"
+                   name="Global Illumination">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderDeferredGI" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RenderDeferredGI" />
+            <menu_item_check.on_enable
+                 function="Advanced.EnableRenderDeferredGI" />
+          </menu_item_check>
+          <menu_item_separator />
+          <menu_item_check
+             label="Debug GL"
+             name="Debug GL">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderDebugGL" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderDebugGL" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Pipeline"
+             name="Debug Pipeline">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderDebugGL" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderDebugGL" />
+            </menu_item_check>
+            <menu_item_check
+             label="Fast Alpha"
+             name="Fast Alpha">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderDebugGL" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderDebugGL" />
+            </menu_item_check>
+            <menu_item_check
+             label="Animation Textures"
+             name="Animation Textures">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderDebugGL" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderDebugGL" />
+            </menu_item_check>
+            <menu_item_check
+             label="Disable Textures"
+             name="Disable Textures">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="TextureDisable" />
+                <menu_item_check.on_click
+                 function="ToggleControl" 
+                 parameter="TextureDisable" />
+            </menu_item_check>
+            <menu_item_check
+              label="Full Res Textures"
+             layout="topleft"
+             name="Rull Res Textures">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="TextureLoadFullRes" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="TextureLoadFullRes" />
+            </menu_item_check>
+            <menu_item_check
+               label="Audit Textures"
+               layout="topleft"
+               name="Audit Textures">
+              <menu_item_check.on_check
+               function="CheckControl"
+               parameter="AuditTexture" />
+              <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="AuditTexture" />
+            </menu_item_check>
+            <menu_item_check
+             label="Texture Atlas"
+             name="Texture Atlas">
+              <menu_item_check.on_check
+               function="CheckControl"
+               parameter="EnableTextureAtlas" />
+              <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="EnableTextureAtlas" />
+            </menu_item_check>
+              <menu_item_check
+             label="Render Attached Lights"
+             name="Render Attached Lights">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderAttachedLights" />
+                <menu_item_check.on_click
+                 function="Advanced.HandleAttchedLightParticles"
+                 parameter="RenderAttachedLights" />
+            </menu_item_check>
+            <menu_item_check
+             label="Render Attached Particles"
+             name="Render Attached Particles">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderAttachedParticles" />
+                <menu_item_check.on_click
+                 function="Advanced.HandleAttchedLightParticles"
+                 parameter="RenderAttachedParticles" />
+            </menu_item_check>
+            <menu_item_check
+             label="Hover Glow Objects"
+             name="Hover Glow Objects">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderHoverGlowEnable" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderHoverGlowEnable" />
+            </menu_item_check>
+        </menu>
+
+        <menu
+         create_jump_keys="true"
+         label="Network"
+         layout="topleft"
+         name="Network"
+         tear_off="true">
+            <menu_item_check
+             label="Pause Agent"
+             layout="topleft"
+             name="AgentPause">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="AgentPause" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="AgentPause" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Enable Message Log"
+             layout="topleft"
+             name="Enable Message Log">
+                <menu_item_call.on_click
+                 function="Advanced.EnableMessageLog" />
+            </menu_item_call>
+            <menu_item_call
+             label="Disable Message Log"
+             layout="topleft"
+             name="Disable Message Log">
+                <menu_item_call.on_click
+                 function="Advanced.DisableMessageLog" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_check
+             label="Velocity Interpolate Objects"
+             layout="topleft"
+             name="Velocity Interpolate Objects">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="VelocityInterpolate" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="VelocityInterpolate" />
+            </menu_item_check>
+            <menu_item_check
+             label="Ping Interpolate Object Positions"
+             layout="topleft"
+             name="Ping Interpolate Object Positions">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="PingInterpolate" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="PingInterpolate" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Drop a Packet"
+             layout="topleft"
+             name="Drop a Packet"
+             shortcut="control|alt|L">
+                <menu_item_call.on_click
+                 function="Advanced.DropPacket" />
+            </menu_item_call>
+        </menu>
+        <menu_item_call
+         label="Dump Scripted Camera"
+         layout="topleft"
+         name="Dump Scripted Camera">
+            <menu_item_call.on_click
+             function="Advanced.DumpScriptedCamera" />
+        </menu_item_call>
+        <menu_item_call
+             label="Bumps, Pushes &amp; Hits"
+             layout="topleft"
+             name="Bumps, Pushes &amp;amp; Hits">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="bumps" />
+            </menu_item_call>
+
+        <menu
+         create_jump_keys="true"
+         label="Recorder"
+         layout="topleft"
+         name="Recorder"
+         tear_off="true">
+            <menu_item_call
+             label="Start Playback"
+             layout="topleft"
+             name="Start Playback">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="start playback" />
+            </menu_item_call>
+            <menu_item_call
+             label="Stop Playback"
+             layout="topleft"
+             name="Stop Playback">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="stop playback" />
+            </menu_item_call>
+            <menu_item_check
+             label="Loop Playback"
+             layout="topleft"
+             name="Loop Playback">
+                <menu_item_check.on_check
+                 function="Advanced.CheckAgentPilotLoop"
+                 parameter="loopPlayback" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleAgentPilotLoop" />
+            </menu_item_check>
+            <menu_item_call
+             label="Start Record"
+             layout="topleft"
+             name="Start Record">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="start record" />
+            </menu_item_call>
+            <menu_item_call
+             label="Stop Record"
+             layout="topleft"
+             name="Stop Record">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="stop record" />
+            </menu_item_call>
+        </menu>
+
+        <menu
+         create_jump_keys="true"
+         label="World"
+         layout="topleft"
+         name="World"
+         tear_off="true">
+            <menu_item_check
+             label="Sim Sun Override"
+             layout="topleft"
+             name="Sim Sun Override">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="SkyOverrideSimSunPosition" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="SkyOverrideSimSunPosition" />
+            </menu_item_check>
+            <menu_item_check
+             label="Cheesy Beacon"
+             layout="topleft"
+             name="Cheesy Beacon">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="CheesyBeacon" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="CheesyBeacon" />
+            </menu_item_check>
+            <menu_item_check
+             label="Fixed Weather"
+             layout="topleft"
+             name="Fixed Weather">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="FixedWeather" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="FixedWeather" />
+            </menu_item_check>
+            <menu_item_call
+             label="Dump Region Object Cache"
+             layout="topleft"
+             name="Dump Region Object Cache">
+                <menu_item_call.on_click
+                 function="Advanced.DumpRegionObjectCache" />
+            </menu_item_call>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="UI"
+         layout="topleft"
+         name="UI"
+         tear_off="true">
+         <!--   <menu_item_check
+             label="New Bottom Bar"
+             layout="topleft"
+             name="New Bottom Bar">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="BottomPanelNew" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="BottomPanelNew" />
+            </menu_item_check>-->
+            <menu_item_call
+             label="Web Browser Test"
+             layout="topleft"
+             name="Web Browser Test">
+                <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://secondlife.com/app/search/slurls.html"/>
+            </menu_item_call>
+            <menu_item_call
+             label="Dump SelectMgr"
+             layout="topleft"
+             name="Dump SelectMgr">
+                <menu_item_call.on_click
+                 function="Advanced.DumpSelectMgr" />
+            </menu_item_call>
+            <menu_item_call
+             label="Dump Inventory"
+             layout="topleft"
+             name="Dump Inventory">
+                <menu_item_call.on_click
+                 function="Advanced.DumpInventory" />
+            </menu_item_call>
+            <menu_item_call
+             label="Dump Timers"
+             name="Dump Timers">
+                <menu_item_call.on_click
+                 function="Advanced.DumpTimers" />
+            </menu_item_call>
+            <menu_item_call
+             label="Dump Focus Holder"
+             layout="topleft"
+             name="Dump Focus Holder"
+             shortcut="control|alt|F">
+                <menu_item_call.on_click
+                 function="Advanced.DumpFocusHolder" />
+            </menu_item_call>
+            <menu_item_call
+             label="Print Selected Object Info"
+             layout="topleft"
+             name="Print Selected Object Info"
+             shortcut="control|shift|P">
+                <menu_item_call.on_click
+                 function="Advanced.PrintSelectedObjectInfo" />
+            </menu_item_call>
+            <menu_item_call
+             label="Print Agent Info"
+             layout="topleft"
+             name="Print Agent Info"
+             shortcut="shift|P">
+                <menu_item_call.on_click
+                 function="Advanced.PrintAgentInfo" />
+            </menu_item_call>
+            <menu_item_call
+             label="Memory Stats"
+             layout="topleft"
+             name="Memory Stats"
+             shortcut="control|alt|shift|M">
+                <menu_item_call.on_click
+                 function="Advanced.PrintTextureMemoryStats" />
+            </menu_item_call>
+            <menu_item_check
+             label="Double-ClickAuto-Pilot"
+             layout="topleft"
+             name="Double-ClickAuto-Pilot">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DoubleClickAutoPilot" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DoubleClickAutoPilot" />
+            </menu_item_check>
+
+            <menu_item_separator />
+            <menu_item_check
+             label="Debug SelectMgr"
+             layout="topleft"
+             name="Debug SelectMgr">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugSelectMgr" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugSelectMgr" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Clicks"
+             layout="topleft"
+             name="Debug Clicks">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugClicks"
+                 parameter="DebugClicks" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugClicks"
+                 parameter="DebugClicks" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Views"
+             layout="topleft"
+             name="Debug Views">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugViews" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugViews" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Name Tooltips"
+             layout="topleft"
+             name="Debug Name Tooltips">
+                <menu_item_check.on_check
+                 function="Advanced.CheckXUINameTooltips"
+                 parameter="XUINameTooltips" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleXUINameTooltips" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Mouse Events"
+             layout="topleft"
+             name="Debug Mouse Events">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugMouseEvents"
+                 parameter="MouseEvents" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugMouseEvents" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Keys"
+             layout="topleft"
+             name="Debug Keys">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugKeys"
+                 parameter="DebugKeys" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugKeys" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug WindowProc"
+             layout="topleft"
+             name="Debug WindowProc">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugWindowProc"
+                 parameter="DebugWindowProc" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugWindowProc"
+                 parameter="DebugWindowProc" />
+            </menu_item_check>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="XUI"
+         name="XUI"
+         tear_off="true">
+            <menu_item_call
+               label="Reload Color Settings"
+               layout="topleft"
+               name="Reload Color Settings">
+              <menu_item_call.on_click
+               function="Advanced.ReloadColorSettings" />
+            </menu_item_call>
+            <menu_item_call
+             label="Show Font Test"
+             layout="topleft"
+             name="Show Font Test">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="font_test" />
+            </menu_item_call>
+            <menu_item_call
+             label="Load from XML"
+             layout="topleft"
+             name="Load from XML">
+                <menu_item_call.on_click
+                 function="Advanced.LoadUIFromXML" />
+            </menu_item_call>
+            <menu_item_call
+             label="Save to XML"
+             layout="topleft"
+             name="Save to XML">
+                <menu_item_call.on_click
+                 function="Advanced.SaveUIToXML" />
+            </menu_item_call>
+            <menu_item_check
+             label="Show XUI Names"
+             layout="topleft"
+             name="Show XUI Names">
+                <menu_item_check.on_check
+                 function="Advanced.CheckXUINames"
+                 parameter="showUIname" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleXUINames" />
+            </menu_item_check>
+          <menu_item_call
+           label="Send Test IMs"
+           layout="topleft"
+           name="Send Test IMs">
+            <menu_item_call.on_click
+             function="Advanced.SendTestIMs" />
+          </menu_item_call>
+          <menu_item_call
+           label="Test Inspectors"
+           name="Test Inspectors"
+           shortcut="control|shift|I">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="test_inspectors" />
+          </menu_item_call>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Avatar"
+         layout="topleft"
+         name="Character"
+         tear_off="true">
+            <menu
+             create_jump_keys="true"
+             label="Grab Baked Texture"
+             layout="topleft"
+             name="Grab Baked Texture"
+             tear_off="true">
+                <menu_item_call
+                 label="Iris"
+                 layout="topleft"
+                 name="Iris">
+                    <menu_item_call.on_click
+                     function="Advanced.GrabBakedTexture"
+                     parameter="iris" />
+                    <menu_item_call.on_enable
+                     function="Advanced.EnableGrabBakedTexture"
+					 parameter="iris" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Head"
+                 layout="topleft"
+                 name="Head">
+                    <menu_item_call.on_click
+                     function="Advanced.GrabBakedTexture"
+                     parameter="head" />
+                    <menu_item_call.on_enable
+                     function="Advanced.EnableGrabBakedTexture"
+					 parameter="head" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Upper Body"
+                 layout="topleft"
+                 name="Upper Body">
+                    <menu_item_call.on_click
+                     function="Advanced.GrabBakedTexture"
+                     parameter="upper" />
+                    <menu_item_call.on_enable
+                     function="Advanced.EnableGrabBakedTexture"
+					 parameter="upper" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Lower Body"
+                 layout="topleft"
+                 name="Lower Body">
+                    <menu_item_call.on_click
+                     function="Advanced.GrabBakedTexture"
+                     parameter="lower" />
+                    <menu_item_call.on_enable
+                     function="Advanced.EnableGrabBakedTexture"
+					 parameter="lower" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Skirt"
+                 layout="topleft"
+                 name="Skirt">
+                    <menu_item_call.on_click
+                     function="Advanced.GrabBakedTexture"
+                     parameter="skirt" />
+                    <menu_item_call.on_enable
+                     function="Advanced.EnableGrabBakedTexture"
+					 parameter="skirt" />
+                </menu_item_call>
+            </menu>
+            <menu
+             create_jump_keys="true"
+             label="Character Tests"
+             layout="topleft"
+             name="Character Tests"
+             tear_off="true">
+                <menu_item_call
+                 label="Appearance To XML"
+                 layout="topleft"
+                 name="Appearance To XML">
+                    <menu_item_call.on_click
+                     function="Advanced.AppearanceToXML" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Toggle Character Geometry"
+                 layout="topleft"
+                 name="Toggle Character Geometry">
+                    <menu_item_call.on_click
+                     function="Advanced.ToggleCharacterGeometry" />
+                    <menu_item_call.on_enable
+                     function="IsGodCustomerService" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Test Male"
+                 layout="topleft"
+                 name="Test Male">
+                    <menu_item_call.on_click
+                     function="Advanced.TestMale" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Test Female"
+                 layout="topleft"
+                 name="Test Female">
+                    <menu_item_call.on_click
+                     function="Advanced.TestFemale" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Toggle PG"
+                 layout="topleft"
+                 name="Toggle PG">
+                    <menu_item_call.on_click
+                     function="Advanced.TogglePG" />
+                </menu_item_call>
+                <menu_item_check
+                 label="Allow Select Avatar"
+                 layout="topleft"
+                 name="Allow Select Avatar">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="AllowSelectAvatar" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="AllowSelectAvatar" />
+                </menu_item_check>
+            </menu>
+            <menu_item_call
+             label="Force Params to Default"
+             layout="topleft"
+             name="Force Params to Default">
+                <menu_item_call.on_click
+                 function="Advanced.ForceParamsToDefault" />
+            </menu_item_call>
+            <menu_item_check
+             label="Animation Info"
+             layout="topleft"
+             name="Animation Info">
+                <menu_item_check.on_check
+                 function="Advanced.CheckAnimationInfo"
+                 parameter="AnimationInfo" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleAnimationInfo"
+                 parameter="" />
+            </menu_item_check>
+            <menu_item_check
+             label="Slow Motion Animations"
+             layout="topleft"
+             name="Slow Motion Animations">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="SlowMotionAnimation" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="SlowMotionAnimation" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Look At"
+             layout="topleft"
+             name="Show Look At">
+                <menu_item_check.on_check
+                 function="Advanced.CheckShowLookAt"
+                 parameter="ShowLookAt" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleShowLookAt" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Point At"
+             layout="topleft"
+             name="Show Point At">
+                <menu_item_check.on_check
+                 function="Advanced.CheckShowPointAt"
+                 parameter="ShowPointAt" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleShowPointAt" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Joint Updates"
+             layout="topleft"
+             name="Debug Joint Updates">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugJointUpdates"
+                 parameter="DebugJointUpdates" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugJointUpdates" />
+            </menu_item_check>
+            <menu_item_check
+             label="Disable LOD"
+             layout="topleft"
+             name="Disable LOD">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDisableLOD"
+                 parameter="DisableLOD" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDisableLOD" />
+            </menu_item_check>
+            <menu_item_check
+             label="Debug Character Vis"
+             layout="topleft"
+             name="Debug Character Vis">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugCharacterVis"
+                 parameter="DebugCharacterVis" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugCharacterVis" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Collision Skeleton"
+             layout="topleft"
+             name="Show Collision Skeleton">
+                <menu_item_check.on_check
+                 function="Advanced.CheckInfoDisplay"
+                 parameter="collision skeleton" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleInfoDisplay"
+                 parameter="collision skeleton" />
+            </menu_item_check>
+            <menu_item_check
+             label="Display Agent Target"
+             layout="topleft"
+             name="Display Agent Target">
+                <menu_item_check.on_check
+                 function="Advanced.CheckInfoDisplay"
+                 parameter="agent target" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleInfoDisplay"
+                 parameter="agent target" />
+            </menu_item_check>
+<!-- Appears not to exist anymore
+            <menu_item_check
+             label="Debug Rotation"
+             layout="topleft"
+             name="Debug Rotation">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugAvatarRotation" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugAvatarRotation" />
+            </menu_item_check> -->
+-->
+            <menu_item_call
+             label="Dump Attachments"
+             layout="topleft"
+             name="Dump Attachments">
+                <menu_item_call.on_click
+                 function="Advanced.DumpAttachments" />
+            </menu_item_call>
+            <menu_item_call
+             label="Debug Avatar Textures"
+             layout="topleft"
+             name="Debug Avatar Textures"
+             shortcut="control|alt|shift|A">
+                <menu_item_call.on_click
+                 function="Advanced.DebugAvatarTextures" />
+            </menu_item_call>
+            <menu_item_call
+             label="Dump Local Textures"
+             layout="topleft"
+             name="Dump Local Textures"
+             shortcut="alt|shift|M">
+                <menu_item_call.on_click
+                 function="Advanced.DumpAvatarLocalTextures" />
+            </menu_item_call>
+        </menu>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Compress Images"
+         layout="topleft"
+         name="Compress Images">
+            <menu_item_call.on_click
+             function="Advanced.CompressImage" />
+        </menu_item_call>
+        <menu_item_check
+         label="Output Debug Minidump"
+         layout="topleft"
+         name="Output Debug Minidump">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="SaveMinidump" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="SaveMinidump" />
+        </menu_item_check>
+        <menu_item_check
+         label="Console Window on next Run"
+         layout="topleft"
+         name="Console Window">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ShowConsoleWindow" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ShowConsoleWindow" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_check
+         label="Show Admin Menu"
+         layout="topleft"
+         name="View Admin Options">
+            <menu_item_check.on_check
+             function="Advanced.CheckViewAdminOptions"
+             parameter="ViewAdminOptions" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleViewAdminOptions" />
+        </menu_item_check>
+        <menu_item_call
+         label="Request Admin Status"
+         layout="topleft"
+         name="Request Admin Options"
+         shortcut="control|alt|G">
+            <menu_item_call.on_click
+             function="Advanced.RequestAdminStatus" />
+        </menu_item_call>
+        <menu_item_call
+         label="Leave Admin Status"
+         layout="topleft"
+         name="Leave Admin Options"
+         shortcut="control|alt|shift|G">
+            <menu_item_call.on_click
+             function="Advanced.LeaveAdminStatus" />
+        </menu_item_call>
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Admin"
+     layout="topleft"
+     name="Admin"
+     tear_off="true"
+     visible="false">
+        <menu
+         create_jump_keys="true"
+         label="Object"
+         layout="topleft"
+         tear_off="true">
+            <menu_item_call
+             label="Take Copy"
+             layout="topleft"
+             name="Take Copy"
+             shortcut="control|alt|shift|O">
+                <menu_item_call.on_click
+                 function="Admin.ForceTakeCopy" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Owner To Me"
+             layout="topleft"
+             name="Force Owner To Me">
+                <menu_item_call.on_click
+                 function="Admin.HandleObjectOwnerSelf" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Force Owner Permissive"
+             layout="topleft"
+             name="Force Owner Permissive">
+                <menu_item_call.on_click
+                 function="Admin.HandleObjectOwnerPermissive" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Delete"
+             layout="topleft"
+             name="Delete"
+             shortcut="control|alt|shift|Del">
+                <menu_item_call.on_click
+                 function="Admin.HandleForceDelete" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Lock"
+             layout="topleft"
+             name="Lock"
+             shortcut="control|alt|shift|L">
+                <menu_item_call.on_click
+                 function="Admin.HandleObjectLock" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Get Assets IDs"
+             layout="topleft"
+             name="Get Assets IDs"
+             shortcut="control|alt|shift|I">
+                <menu_item_call.on_click
+                 function="Admin.HandleObjectAssetIDs" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Parcel"
+         layout="topleft"
+         name="Parcel"
+         tear_off="true">
+            <menu_item_call
+             label="Owner To Me"
+             layout="topleft"
+             name="Owner To Me">
+                <menu_item_call.on_click
+                 function="Admin.HandleForceParcelOwnerToMe" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Set to Linden Content"
+             layout="topleft"
+             name="Set to Linden Content"
+             shortcut="control|alt|shift|C">
+                <menu_item_call.on_click
+                 function="Admin.HandleForceParcelToContent" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Claim Public Land"
+             layout="topleft"
+             name="Claim Public Land">
+                <menu_item_call.on_click
+                 function="Admin.HandleClaimPublicLand" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+        </menu>
+        <menu
+         create_jump_keys="true"
+         label="Region"
+         layout="topleft"
+         name="Region"
+         tear_off="true">
+            <menu_item_call
+             label="Dump Temp Asset Data"
+             layout="topleft"
+             name="Dump Temp Asset Data">
+                <menu_item_call.on_click
+                 function="Admin.HandleRegionDumpTempAssetData" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+            <menu_item_call
+             label="Save Region State"
+             layout="topleft"
+             name="Save Region State">
+                <menu_item_call.on_click
+                 function="Admin.OnSaveState" />
+                <menu_item_call.on_enable
+                 function="IsGodCustomerService" />
+            </menu_item_call>
+        </menu>
+        <menu_item_call
+         label="God Tools"
+         layout="topleft"
+         name="God Tools">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="god_tools" />
+            <menu_item_call.on_enable
+             function="IsGodCustomerService" />
+        </menu_item_call>
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Admin"
+     layout="topleft"
+     name="Deprecated"
+     tear_off="true"
+     visible="false">
+        <menu
+         create_jump_keys="true"
+         label="Attach Object"
+         layout="topleft"
+         mouse_opaque="false"
+         name="Attach Object"
+         tear_off="true" />
+        <menu
+         create_jump_keys="true"
+         label="Detach Object"
+         layout="topleft"
+         mouse_opaque="false"
+         name="Detach Object"
+         tear_off="true" />
+        <menu
+         create_jump_keys="true"
+         label="Take Off Clothing"
+         layout="topleft"
+         mouse_opaque="false"
+         name="Take Off Clothing"
+         tear_off="true">
+            <menu_item_call
+             label="Shirt"
+             layout="topleft"
+             name="Shirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shirt" />
+            </menu_item_call>
+            <menu_item_call
+             label="Pants"
+             layout="topleft"
+             name="Pants">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="pants" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="pants" />
+            </menu_item_call>
+            <menu_item_call
+             label="Shoes"
+             layout="topleft"
+             name="Shoes">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shoes" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shoes" />
+            </menu_item_call>
+            <menu_item_call
+             label="Socks"
+             layout="topleft"
+             name="Socks">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="socks" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="socks" />
+            </menu_item_call>
+            <menu_item_call
+             label="Jacket"
+             layout="topleft"
+             name="Jacket">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="jacket" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="jacket" />
+            </menu_item_call>
+            <menu_item_call
+             label="Gloves"
+             layout="topleft"
+             name="Gloves">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="gloves" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="gloves" />
+            </menu_item_call>
+            <menu_item_call
+             label="Undershirt"
+             layout="topleft"
+             name="Menu Undershirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="undershirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="undershirt" />
+            </menu_item_call>
+            <menu_item_call
+             label="Underpants"
+             layout="topleft"
+             name="Menu Underpants">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="underpants" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="underpants" />
+            </menu_item_call>
+            <menu_item_call
+             label="Skirt"
+             layout="topleft"
+             name="Skirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="skirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="skirt" />
+            </menu_item_call>
+            <menu_item_call
+             label="Alpha"
+             layout="topleft"
+             name="Alpha">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="alpha" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="alpha" />
+            </menu_item_call>
+            <menu_item_call
+             label="Tattoo"
+             layout="topleft"
+             name="Tattoo">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="tattoo" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="tattoo" />
+            </menu_item_call>
+            <menu_item_call
+             label="All Clothes"
+             layout="topleft"
+             name="All Clothes">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="all" />
+            </menu_item_call>
+        </menu>
+        <menu_item_check
+         label="Show Toolbar"
+         layout="topleft"
+         name="Show Toolbar">
+            <menu_item_check.on_check
+             function="FloaterVisible"
+             parameter="toolbar" />
+            <menu_item_check.on_click
+             function="ShowFloater"
+             parameter="toolbar" />
+        </menu_item_check>
+        <menu
+         create_jump_keys="true"
+         label="Help"
+         layout="topleft"
+         name="Help"
+         tear_off="true">
+            <menu_item_call
+             label="Official Linden Blog"
+             layout="topleft"
+             name="Official Linden Blog">
+                <menu_item_call.on_click
+                 function="PromptShowURL"
+                 name="OfficialLindenBlog_url"
+                 parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" />
+            </menu_item_call>
+            <menu_item_call
+             label="Scripting Portal"
+             layout="topleft"
+             name="Scripting Portal">
+                <menu_item_call.on_click
+                 function="PromptShowURL"
+                 name="ScriptingPortal_url"
+                 parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
+            </menu_item_call>
+            <menu
+             create_jump_keys="true"
+             label="Bug Reporting"
+             layout="topleft"
+             name="Bug Reporting"
+             tear_off="true">
+                <menu_item_call
+                 label="Public Issue Tracker"
+                 layout="topleft"
+                 name="Public Issue Tracker">
+                    <menu_item_call.on_click
+                     function="PromptShowURL"
+                     name="PublicIssueTracker_url"
+                     parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Public Issue Tracker Help"
+                 layout="topleft"
+                 name="Publc Issue Tracker Help">
+                    <menu_item_call.on_click
+                     function="PromptShowURL"
+                     name="PublicIssueTrackerHelp_url"
+                     parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+                </menu_item_call>
+                <menu_item_separator
+                 layout="topleft" />
+                <menu_item_call
+                 label="Bug Reporting 101"
+                 layout="topleft"
+                 name="Bug Reporing 101">
+                    <menu_item_call.on_click
+                     function="PromptShowURL"
+                     name="BugReporting101_url"
+                     parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Security Issues"
+                 layout="topleft"
+                 name="Security Issues">
+                    <menu_item_call.on_click
+                     function="PromptShowURL"
+                     name="SecurityIssues_url"
+                     parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+                </menu_item_call>
+                <menu_item_call
+                 label="QA Wiki"
+                 layout="topleft"
+                 name="QA Wiki">
+                    <menu_item_call.on_click
+                     function="PromptShowURL"
+                     name="QAWiki_url"
+                     parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+                </menu_item_call>
+            </menu>
+        </menu>
+    </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ff0cd7ffeb..0d1ed6fc64 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -581,9 +581,10 @@ Multiple faces are currently selected.
 If you continue this action, separate instances of media will be set on multiple faces of the object.
 To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add.
     <usetemplate
-	 name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
+      ignoretext="Media will be set on multiple selected faces"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="OK"/>
   </notification>
 
   <notification
@@ -4957,8 +4958,9 @@ No valid parcel could be found.
   <notification
    icon="notify.tga"
    name="ObjectGiveItem"
-   type="notify">
-An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
+   type="offer">
+An object named [OBJECTFROMNAME] owned by [NAME] has offered you [OBJECTTYPE]:
+[ITEM_SLURL]
     <form name="form">
       <button
        index="0"
@@ -5000,7 +5002,8 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
    icon="notify.tga"
    name="UserGiveItem"
    type="offer">
-[NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+[NAME] has offered you [OBJECTTYPE]:
+[ITEM_SLURL]
     <form name="form">
       <button
        index="0"
@@ -5585,7 +5588,7 @@ We&apos;re sorry.  This area has reached maximum capacity for voice conversation
    icon="notifytip.tga"
    name="VoiceChannelDisconnected"
    type="notifytip">
-You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
+You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to Nearby Voice Chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -5595,7 +5598,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="VoiceChannelDisconnectedP2P"
    type="notifytip">
-[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
+[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -5605,7 +5608,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="P2PCallDeclined"
    type="notifytip">
-[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
+[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -5615,7 +5618,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="P2PCallNoAnswer"
    type="notifytip">
-[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
+[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -5625,7 +5628,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="VoiceChannelJoinFailed"
    type="notifytip">
-Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
+Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to Nearby Voice Chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -5739,6 +5742,15 @@ Are you sure you want to delete your teleport history?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   name="BottomTrayButtonCanNotBeShown"
+   type="alert">
+Selected button can not be shown right now.
+The button will be shown when there is enough space for it.
+  </notification>
+
+
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
   </global>
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index 8b815b0f71..3ed91cb48f 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -7,7 +7,9 @@
 	left="0"
 	height="35"
 	width="318"
-	background_visible="false">
+  background_opaque="false"
+  background_visible="true"
+  bg_alpha_color="0.0 0.0 0.0 0.0" >
   <chiclet_im_p2p
 		name="p2p_chiclet"
 		layout="topleft"
@@ -15,7 +17,16 @@
 		top="3"
 		left="5"
 		height="25"
-		width="25">
+		width="25"
+    visible="false"
+    speaker.name="speaker_p2p"
+    speaker.width="20"
+    speaker.height="25"
+    speaker.left="25"
+    speaker.top="25"
+    speaker.auto_update="true"
+    speaker.draw_border="false"
+    speaker.visible="false">
   </chiclet_im_p2p>
   <chiclet_im_group
 		name="group_chiclet"
@@ -24,14 +35,41 @@
 		top="3"
 		left="5"
 		height="25"
-		width="25">
+		width="25"
+    visible="false"
+    speaker.name="speaker_grp"
+    speaker.width="20"
+    speaker.height="25"
+    speaker.left="25"
+    speaker.top="25"
+    speaker.auto_update="true"
+    speaker.draw_border="false"
+    speaker.visible="false">
   </chiclet_im_group>
+  <chiclet_im_adhoc
+		name="adhoc_chiclet"
+		layout="topleft"
+		follows="left"
+		top="3"
+		left="5"
+		height="25"
+		width="25"
+    visible="false"
+    speaker.name="speaker_hoc"
+    speaker.width="20"
+    speaker.height="25"
+    speaker.left="25"
+    speaker.top="25"
+    speaker.auto_update="true"
+    speaker.draw_border="false"
+    speaker.visible="false">
+  </chiclet_im_adhoc>
 	<text
 		type="string"
 		name="contact_name"
 		layout="topleft"
 		top="10"
-		left_pad="0"
+		left_pad="20"
 		height="14"
 		width="245"
 		length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 0246e21d25..a283cff5b3 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,10 +4,9 @@
  height="215"
  name="panel_im_control_panel"
  width="180">
-
     <avatar_list
      color="DkGray2"
-     follows="left|top|right|bottom"
+     follows="all"
      height="130"
      ignore_online_status="true"
      layout="topleft"
@@ -18,11 +17,10 @@
      show_profile_btn="false"
      show_speaking_indicator="false"
      top="10"
-     width="180"/>
-
+     width="180" />
     <panel
      background_visible="true"
-     bg_alpha_color="0.2 0.2 0.2 1"
+     bg_alpha_color="DkGray2"
      border="false"
      bottom="1"
      follows="left|bottom"
@@ -32,32 +30,27 @@
      name="panel_call_buttons"
      top_pad="0"
      width="180">
-
         <button
          bottom="10"
          height="20"
          label="Call"
-         left_delta="28"
+         left_delta="40"
          name="call_btn"
-         width="125"/>
-
+         width="100" />
         <button
          bottom="40"
          height="20"
          label="Leave Call"
          name="end_call_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
         <button
          enabled="false"
          bottom="10"
          height="20"
-         label="Open Voice Controls"
+         label="Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
     </panel>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
index 16c8660781..b779b08a63 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
@@ -4,66 +4,63 @@
  top="10"
  width="250"
  height="100"
- background_opaque="false"
- background_visible="true"
- follows="left|top|bottom|right"
- bg_alpha_color="0.3 0.3 0.3 1.0">
-	<panel 
-     width="250" 
-     height="30" 
-     background_visible="true" 
-     background_opaque="false" 
+ follows="all">
+  <panel
+     width="240"
+     height="24"
+     left="5"
+     background_visible="true"
+     background_opaque="false"
      follows="left|top|right"
-     bg_alpha_color="0.0 0.0 0.0 1.0" 
+     top="-5"
+     bg_alpha_color="black"
      name="msg_caption">
-  		<avatar_icon
-         top="-7" 
-         left="10" 
-         width="20" 
-         height="20" 
+  	<avatar_icon
+         top="-3"
+         left="3"
+         width="18"
+         image_name="Generic_Person"
+         height="18"
          follows="left|top"
-         color="1 1 1 1" 
-         enabled="true" 
-         name="avatar_tag_icon"/>
+         enabled="true"
+         name="avatar_tag_icon" />
     	<text
-         width="160" 
-         top="-10" 
-         left="40" 
-         height="20" 
+         width="160"
+         top="-8"
+         left="30"
+         height="20"
          follows="left|right|top"
-         font="SansSerifBigBold" 
-         text_color="white" 
+	 font.style="BOLD"
+         text_color="white"
          word_wrap="true"
-         mouse_opaque="true" 
-         name="sender_tag_name" >
+         mouse_opaque="true"
+         name="sender_tag_name">
 	      Angela Tester
     	</text>
-    	<text 
-         width="30" 
-         top="-12" 
-         left="210" 
-         height="20" 
-         follows="right|top"
-         text_color="white" 
-         word_wrap="true" 
-         mouse_opaque="true" 
-         name="tag_time" >
-      		07:52
-		</text>
+	<text
+        font="SansSerifSmall"
+         follows="right"
+         height="13"
+         layout="topleft"
+	 halign="right"
+         right="-5"
+         name="tag_time"
+         top="8"
+         value="23:30"
+         width="50" />
 	</panel>
-	<text_editor
-     top="65" 
-     left="10" 
-     right="-10" 
-     height="100" 
-     follows="left|top|bottom|right"
-     font="SansSerifSmall" 
+ <text_editor
+ bg_readonly_color="DkGray"
+     font="SansSerifSmall"
+     top="65"
+     left="5"
+     right="-5"
+     height="100"
+     follows="all"
      read_only="true"
-     bg_readonly_color="0 0 0 0"
      word_wrap="true"
-     mouse_opaque="true" 
-     name="msg_text" >
+     mouse_opaque="true"
+     name="msg_text">
      The quick brown fox jumps over the lazy dog.
     </text_editor>
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 5c8a8ee208..3842c2a8db 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -61,6 +61,7 @@
      layout="topleft"
      left_delta="0"
      name="Block object by name..."
+     tool_tip="Pick an object to block by name"
      top_pad="4"
      width="210" >
         <button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 3c16a439d9..00711a29e0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -94,7 +94,7 @@
          min_height="28"
          width="82"
          top_delta="0"
-         min_width="82"
+         min_width="52"
          name="gesture_panel"
          user_resize="false">
          <gesture_combo_box
@@ -105,9 +105,13 @@
           name="Gesture"
           left="0"
           top="3"
-         use_ellipses="true"
           width="82"
-          tool_tip="Shows/hides gestures"/>
+          tool_tip="Shows/hides gestures">
+             <gesture_combo_box.drop_down_button
+              font="SansSerifSmall"
+              pad_right="10" 
+              use_ellipses="true" />
+         </gesture_combo_box>
         </layout_panel>
 		 <icon
          auto_resize="false"
@@ -131,7 +135,7 @@
          name="movement_panel"
          user_resize="false"
          width="80"
-         min_width="80">
+         min_width="49">
             <button
              follows="left|right"
              height="23"
@@ -167,7 +171,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="80"
+         min_width="49"
          name="cam_panel"
          user_resize="false"
          width="80">
@@ -295,8 +299,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_height="28"
          top="0"
          name="sys_well_panel"
-         width="34"
-         min_width="34"
+         width="54"
+         min_width="54"
          user_resize="false">
             <chiclet_notification
              follows="right"
@@ -305,22 +309,21 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              left="0"
              name="sys_well"
              top="4"
-             width="34">
+             width="54">
               <button
               auto_resize="true"
                halign="right"
                height="23"
                follows="right"
                flash_color="EmphasisColor"
+               left="0"
                name="Unread"
                image_overlay="Notices_Unread"
-               width="20"
+               image_overlay_alignment="right" 
+               pad_right="6"
+               pad_left="6"
+               width="54"
                />
-               <unread_notifications
-               width="34"
-               height="20"
-               left="0"
-               top="19" />
 	    </chiclet_notification>
         </layout_panel>
        <icon
@@ -333,6 +336,6 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="4" 
          right="-1"
          top="0"
-         width="26"/>
+         width="4"/>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 64519b2571..7a3eae35a9 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -1,44 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="black"
- follows="left|top|right"
- height="20"
- label="im_header"
- layout="topleft"
- name="im_header" >
-    <avatar_icon
-     follows="left"
-     height="16"
-     image_name="icon_avatar_online.tga"
+      background_visible="true"
+     bevel_style="in"
+     bg_alpha_color="black"
+     follows="top|left|right"
+     height="24"
+     label="im_header"
      layout="topleft"
-     left="2"
-     mouse_opaque="true"
-     name="avatar_icon"
-     top="2"
-     width="16" />
+     name="im_header"
+     width="300">
+            <avatar_icon
+         follows="left"
+         height="18"
+         image_name="Generic_Person"
+         layout="topleft"
+         left="3"
+         mouse_opaque="true"
+         name="avatar_icon"
+         top="3"
+         width="18" />
     <text
      follows="left|right"
-     font="SansSerifBigBold"
-     height="20"
-     layout="topleft"
-     left_pad="6"
+      font.style="BOLD"
+         height="12"
+         layout="topleft"
+         left_pad="5"
      right="-50"
      name="user_name"
      text_color="white"
-     top="3"
-     value="Darth Vader"
-     use_ellipses="true" />
+         top="8"
+         use_ellipses="true"
+         value="Erica Vader" />
     <text
-     follows="right"
-     font="SansSerifBig"
-     height="20"
-     layout="topleft"
+            font="SansSerifSmall"
+         follows="right"
+         halign="right"
+         height="13"
+         layout="topleft"
+         left_pad="5"
      name="time_box"
-     right="0"
-     text_color="white"
-     top="3"
-     value="23:30"
-     width="50" />
+     right="-10"
+     top="8"
+         value="23:30"
+         width="50" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 05b04bbf8e..2b29796f0a 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -1,38 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
-
 <panel
   name="instant_message"
   width="300"
   height="180"
-  background_opaque="true"
-  background_visible="false"
-  follows="left|top|right|bottom"
-  bg_alpha_color="0.3 0.3 0.3 0">
-	<panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption">
-  		<avatar_icon
-      		top="25" left="10" width="20" height="20" follows="left|top"
-      		color="1 1 1 1" enabled="true" name="avatar_icon"
-		  />
+  follows="all">
+	<panel
+	width="290"
+	height="24"
+	background_visible="true"
+	background_opaque="false"
+	bg_alpha_color="Black"
+	left="5"
+	name="msg_caption">
+             <avatar_icon
+         follows="left"
+         height="18"
+         image_name="Generic_Person"
+         layout="topleft"
+         left="3"
+         mouse_opaque="true"
+         name="avatar_icon"
+         top="3"
+         width="18" />
     	<text
-        	width="130" top="25" left="40" height="20" follows="left|right|top"
-        	font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true"
-        	mouse_opaque="true" name="sender_name" >
+                font.style="BOLD"
+                height="12"
+	    layout="topleft"
+	    left_pad="5"
+	    top="7"
+		text_color="white"
+		word_wrap="false"
+		use_ellipses="true"
+        	mouse_opaque="true"
+		name="sender_name"
+        	width="150">
 	      Jerry Knight
     	</text>
-    	<icon top="22" left="170" width="15" height="15" follows="top|right"
-      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/>
-    	<icon top="22" left="190" width="10" height="10" follows="top|right"
-      		image_name="speaking_indicator.tga"	name="msg_icon"/>
-    	<text width="35" top="22" left="205" height="20" follows="right|top"
-        		text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" >
-      		10:32
-		</text>
+   <!-- 	<icon top="22" left="215" width="15" height="15" follows="top|right"
+      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector" />-->
+    	<!--<icon top="22" left="215" width="10" height="10" follows="top|right"
+      		image_name="speaking_indicator.tga"	name="msg_icon"/>-->
+	 <text
+            font="SansSerifSmall"
+         follows="right|top"
+	 halign="right"
+         height="13"
+         layout="topleft"
+         right="-10"
+	 left="205"
+	 mouse_opaque="true"
+      name="msg_time"
+        top="8"
+         value="23:30"
+         width="50"
+	 word_wrap="true" />
 	</panel>
 	<text_chat
-      top="-35" left="10" right="-10" height="120" follows="left|right|bottom"
-      font="SansSerifSmall" text_color="white" word_wrap="true"
-      mouse_opaque="true" name="msg_text" >    
+      top="-35"
+      left="10"
+      right="-10"
+      height="120"
+      follows="left|right|bottom"
+      text_color="white"
+      word_wrap="true"
+      mouse_opaque="true"
+      name="msg_text">
+      To be or not to be, that is the question. Tis a far far better thing I do than I have ever done. Tis a far far better place I go, than I have ever been.
 	</text_chat>
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 763dd7b922..2fee2033f6 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -8,7 +8,7 @@
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="130"
+     height="100"
      ignore_online_status="true"
      layout="topleft"
      left="3"
@@ -32,7 +32,6 @@
      background_visible="true"
      bg_alpha_color="0.2 0.2 0.2 1"
      border="false"
-     bottom="1"
      follows="left|bottom"
      height="70"
      left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index ef3120174e..2e4df92da4 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -1,77 +1,105 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0"
-	height="155" label="instant_message" layout="topleft" left="0"
-	name="panel_group_notify" top="0" width="350">
+<panel
+ background_visible="true"
+ bevel_style="in"
+ bg_alpha_color="0 0 0 0"
+ height="90"
+ label="instant_message"
+ layout="topleft"
+ left="0"
+ name="panel_group_notify"
+ top="0"
+ width="305">
     <string
-     name="message_max_lines_count">
-        4
-    </string>
-	<panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black"
-		height="30" label="header" layout="topleft" left="0" name="header"
-		top="0" width="350">
-		<icon follows="left|top|right|bottom" height="20"  width="20" layout="topleft"
-			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
-		<text type="string" length="1" follows="left|top|right|bottom"
-			font="SansSerifBigBold" height="20" layout="topleft" left_pad="10" name="title"
-			text_color="GroupNotifyTextColor" top="5" width="275" use_ellipses="true">
-			Sender Name / Group Name
-        </text>
-	</panel>
-	<text
+     name="message_max_lines_count"
+     value="7" />
+    <string
+     name="subject_font"
+     value="SANSSERIF_BIG" />
+    <string
+     name="date_font"
+     value="SANSSERIF" />
+    <panel
+     background_visible="true"
+     bevel_style="in"
+     bg_alpha_color="black"
      follows="top"
-     height="20"
+     height="30"
+     label="header"
+     layout="topleft"
+     left="0"
+     name="header"
+     top="0"
+     width="305">
+        <icon
+         follows="left|top|right|bottom"
+         height="20"
+         layout="topleft"
+         left="5"
+         mouse_opaque="true"
+         name="group_icon"
+         top="5"
+         width="20" />
+        <text
+         follows="left|top|right|bottom"
+         font="SansSerifBigBold"
+         height="20"
+         layout="topleft"
+         left_pad="10"
+         name="title"
+         text_color="GroupNotifyTextColor"
+         top="5"
+         use_ellipses="true"
+         value="Sender Name / Group Name"
+         width="230" />
+    </panel>
+    <text_editor
+     allow_html="true"
+     enabled="true"
+     follows="left|top|bottom|right"
+     height="0"
      layout="topleft"
      left="25"
-     name="subject"
+     max_length="2147483647"
+     name="message"
+     parse_highlights="true"
+     read_only="true"
      text_color="GroupNotifyTextColor"
-     font="SansSerifBig"
      top="40"
+     type="string"
      use_ellipses="true"
-     value="subject"
-     width="300"
-     word_wrap="true">
-     subject 
-    </text>
-    <text
-     follows="top"
-     height="20"
+     value="message"
+     width="270" 
+	 word_wrap="true" >
+    </text_editor>
+    <icon
+     bottom="60"
+     follows="left|bottom|right"
+     height="15"
      layout="topleft"
      left="25"
-     name="datetime"
-     text_color="GroupNotifyTextColor"
-     font="SansSerif"
-     top="80"
-     use_ellipses="true"
-     value="datetime"
-     width="300"
-     word_wrap="true">
-     datetime
-    </text>
+     mouse_opaque="true"
+     name="attachment_icon"
+     width="15" />
     <text
-     follows="left|top|bottom|right"
-     height="0"
+     bottom="60"
+     follows="left|bottom|right"
+     font="SansSerif"
+     height="15"
      layout="topleft"
-     left="25"
-     name="message"
+     left="45"
+     name="attachment"
      text_color="GroupNotifyTextColor"
-     top="100"
+     value="Attachment"
      use_ellipses="true"
-     value="message"
-     width="300"
-     word_wrap="true"
-     visible="true" >
-    </text>
-    <icon
-	  follows="left|bottom|right" height="15" width="15"
-		layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true"
-	/>
-	<text font="SansSerif" font.style="UNDERLINE" font_shadow="none"
-		type="string" length="1" follows="left|bottom|right" layout="topleft"
-		left="45" bottom="122" height="15" width="280" name="attachment"
-		text_color="GroupNotifyTextColor" visible="true">
-		Attachment
-     </text>
-
-	<button label="OK" layout="topleft" bottom="145" left="140" height="20"
-		width="70" name="btn_ok" follows="bottom" />
-</panel>
\ No newline at end of file
+     width="250" />
+    <button
+     bottom="85"
+     follows="bottom"
+     height="20"
+     label="OK"
+     layout="topleft"
+     left="25"
+     name="btn_ok"
+     width="70" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index e81532ec3e..73d843e6dd 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,101 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- height="350"
+ height="300"
  name="panel_im_control_panel"
- width="131">
-
+ width="110">
     <avatar_icon
      follows="left|top"
-     height="125"
-     left_delta="3"
+     height="100"
+     left_delta="5"
      name="avatar_icon"
-     top="-10"
-     width="125"/>
-
+     top="-5"
+     width="100"/>
     <text
      follows="top|left|right"
-     font="SansSerifBig"
-     height="16"
+     font="SansSerifLarge"
+     height="22"
      layout="topleft"
      name="avatar_name"
      use_ellipses="true"
      value="Unknown"
-     width="125" />
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
-     label="View Profile"
+     label="Profile"
      name="view_profile_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Add Friend"
      name="add_friend_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Teleport"
      name="teleport_btn"
-     width="125"/>
-
-    <button
-     follows="left|bottom"
+     width="100" />
+  <!--  <button
+     follows="left|top"
      height="20"
      label="Share"
      name="share_btn"
-     width="125"/>
-
-    <button
-     follows="left|bottom"
+     width="100" />-->
+     <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
+ <!--   <button
+     follows="left|top"
      height="20"
      label="Pay"
      name="pay_btn"
-     width="125"/>
-
+     width="100" />-->
     <panel
      background_visible="true"
-     bg_alpha_color="0.2 0.2 0.2 1"
+     bg_alpha_color="DkGray2"
      border="false"
-     bottom="1"
+     top_pad="10"
      follows="left|bottom"
      height="70"
-     left="0"
-     left_pad="0"
+     left="1"
      name="panel_call_buttons"
-     top_pad="0"
-     width="131">
-
+     width="109">
         <button
          bottom="10"
          height="20"
          label="Call"
-         left_delta="3"
+         left_delta="5"
          name="call_btn"
-         width="125"/>
-
+         width="100" />
         <button
-         bottom="40"
+         bottom="35"
          height="20"
          label="Leave Call"
          name="end_call_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
         <button
          enabled="false"
          bottom="10"
          height="20"
-         label="Open Voice Controls"
+         label="Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
     </panel>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index be56866119..1e570bf207 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 0"
  height="175"
  label="im_panel"
  layout="topleft"
@@ -18,7 +17,7 @@
      bevel_style="in"
      bg_alpha_color="black"
      follows="top"
-     height="20"
+     height="24"
      label="im_header"
      layout="topleft"
      left="5"
@@ -27,52 +26,53 @@
      width="295">
         <avatar_icon
          follows="right"
-         height="20"
-         image_name="icon_avatar_online.tga"
+         height="18"
+         image_name="Generic_Person"
          layout="topleft"
-         left="0"
+         left="3"
          mouse_opaque="true"
          name="avatar_icon"
-         top="0"
-         width="20" />
-        <icon
+         top="3"
+         width="18" />
+        <!--<icon
          follows="right"
          height="20"
-         image_name="icon_top_pick.tga"
+         image_name=""
          layout="topleft"
-         left="0"
+         left="3"
          mouse_opaque="true"
          name="sys_msg_icon"
          top="0"
-         width="20" />
+         width="20" />-->
         <text
          follows="left|right"
-         font="SansSerifBold"
-         height="20"
+         font.style="BOLD"
+         height="12"
          layout="topleft"
          left_pad="5"
          name="user_name"
          text_color="white"
-         top="5"
-         value="Darth Vader"
-         width="295" />
+         top="8"
+         use_ellipses="true"
+         value="Erica Vader"
+         width="212" />
 	 <!-- TIME STAMP -->
         <text
+        font="SansSerifSmall"
          follows="right"
-         font="SansSerif"
-         height="20"
+         height="13"
          layout="topleft"
 	 halign="right"
-         left="245"
+         right="-5"
          name="time_box"
-         text_color="white"
-         top="5"
+         top="8"
          value="23:30"
          width="50" />
     </panel>
     <text
-     follows="left|top|bottom|right"
-     height="86"
+        font="SansSerifSmall"
+     follows="all"
+     height="97"
      layout="topleft"
      left="10"
      name="message"
@@ -85,12 +85,11 @@
      max_length="350" />
     <button
      follows="bottom"
-     font="SansSerifBold"
-     height="25"
+     height="23"
      label="Reply"
      layout="topleft"
-     left="97"
+     left="100"
      name="reply"
-     top="137"
-     width="110" />
+     top="144"
+     width="100" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index b01ddbf75a..a219e30b8b 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -87,8 +87,8 @@
      width="313">
         <panel
          bg_alpha_color="DkGray2"
-         follows="all"
-         height="533"
+         follows="left|top|right"
+         height="610"
          layout="topleft"
          left="0"
          min_height="300"
@@ -145,7 +145,7 @@
              top_pad="10"
              width="18" />
             <text
-             follows="right|top"
+             follows="left|top|right"
              height="16"
              layout="topleft"
              left_pad="8"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index f05684db10..4b91dc6294 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -63,7 +63,7 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
-             start_folder="INVENTORY"
+             start_folder="My Inventory"
              width="380"/>
           </accordion_tab>
           <accordion_tab
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cb5ec15387..a9a02e8fc7 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -27,6 +27,7 @@
      border_visible="false"
      bottom="600"
      follows="all"
+	 hide_loading="true"
      left="0"
      name="login_html"
      start_url=""
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index fcee0ef953..a4149c174f 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,467 +1,467 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel

- background_visible="true"

- follows="all"

- height="400"

- label="Things"

- layout="topleft"

- min_height="350"

- min_width="240"

- name="main inventory panel"

- width="330">

-    <panel.string

-     name="Title">

-        Things

-    </panel.string>

-    <filter_editor

-     text_pad_left="12"

-     follows="left|top|right"

-	 font="SanSerif"

-     height="20"

-     label="Filter"

-     layout="topleft"

-     left="15"

-     name="inventory search editor"

-     top="34"

-     width="300" />

-    <tab_container

-     follows="left|top|right|bottom"

-     height="300"

-     layout="topleft"

-     left_delta="-4"

-     name="inventory filter tabs"

-     tab_position="top"

-     top_pad="4"

-     width="305">

-        <inventory_panel

-         follows="left|top|right|bottom"

-         height="295"

-         label="All Items"

-         layout="topleft"

-         left="1"

-         name="All Items"

-         top="16"

-         width="290" />

-        <inventory_panel

-         follows="left|top|right|bottom"

-         height="295"

-         label="Recent Items"

-         layout="topleft"

-         left_delta="0"

-         name="Recent Items"

-         top_delta="0"

-         width="290" />

-    </tab_container>

-

-    <panel

-     background_visible="true"

-     bevel_style="none"

-     bottom="0"

-     follows="left|right|bottom"

-     height="30"

-     layout="bottomleft"

-     left="0"

-	 visible="true"

-     name="bottom_panel"

-     width="330">

-        <button

-         follows="bottom|left"

-         tool_tip="Show additional options"

-         height="18"

-         image_disabled="OptionsMenu_Disabled"

-         image_selected="OptionsMenu_Press"

-         image_unselected="OptionsMenu_Off"

-         layout="topleft"

-         left="10"

-         name="options_gear_btn"

-         picture_style="true"

-         top="6"

-         width="18" />

-        <button

-         follows="bottom|left"

-         height="18"

-         image_selected="AddItem_Press"

-         image_unselected="AddItem_Off"

-         image_disabled="AddItem_Disabled"

-         layout="topleft"

-         left_pad="5"

-         name="add_btn"

-         picture_style="true"

-         tool_tip="Add new item"

-         width="18" />

-        <dnd_button

-         follows="bottom|right"

-         height="18"

-         image_selected="TrashItem_Press"

-         image_unselected="TrashItem_Off"

-         layout="topleft"

-         right="-5"

-         name="trash_btn"

-         picture_style="true"

-         tool_tip="Remove selected item"

-         top="6"

-         width="18" />

-    </panel>

-

-    <menu_bar

-     bg_visible="false"

-     follows="left|top|right"

-     height="18"

-     layout="topleft"

-     left_delta="0"

-     mouse_opaque="false"

-     name="Inventory Menu"

-     top="15"

-	 visible="true"

-     width="290">

-        <menu

-         height="101"

-         label="File"

-         layout="topleft"

-         left="0"

-         mouse_opaque="false"

-         name="File"

-         tear_off="true"

-         top="-117"

-         width="128">

-            <menu_item_call

-             label="Open"

-             layout="topleft"

-             name="Open">

-                <menu_item_call.on_click

-                 function="Inventory.DoToSelected"

-                 parameter="open" />

-            </menu_item_call>

-            <menu

-             create_jump_keys="true"

-             label="Upload"

-             layout="topleft"

-             name="upload"

-             tear_off="true">

-                <menu_item_call

-                 label="Image (L$[COST])..."

-                 layout="topleft"

-                 name="Upload Image"

-                 shortcut="control|U">

-                    <menu_item_call.on_click

-                     function="File.UploadImage"

-                     parameter="" />

-                    <menu_item_call.on_enable

-                     function="File.EnableUpload" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Sound (L$[COST])..."

-                 layout="topleft"

-                 name="Upload Sound">

-                    <menu_item_call.on_click

-                     function="File.UploadSound"

-                     parameter="" />

-                    <menu_item_call.on_enable

-                     function="File.EnableUpload" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Animation (L$[COST])..."

-                 layout="topleft"

-                 name="Upload Animation">

-                    <menu_item_call.on_click

-                     function="File.UploadAnim"

-                     parameter="" />

-                    <menu_item_call.on_enable

-                     function="File.EnableUpload" />

-                </menu_item_call>

-                <menu_item_call

-                 label="Bulk (L$[COST] per file)..."

-                 layout="topleft"

-                 name="Bulk Upload">

-                    <menu_item_call.on_click

-                     function="File.UploadBulk"

-                     parameter="" />

-                </menu_item_call>

-                <menu_item_separator

-                 layout="topleft" />

-            </menu>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_call

-             label="New Window"

-             layout="topleft"

-             name="New Window">

-                <menu_item_call.on_click

-                 function="Inventory.NewWindow" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft"

-             name="separator2" />

-            <menu_item_call

-             label="Show Filters"

-             layout="topleft"

-             name="Show Filters">

-                <menu_item_call.on_click

-                 function="Inventory.ShowFilters" />

-            </menu_item_call>

-            <menu_item_call

-             label="Reset Filters"

-             layout="topleft"

-             name="Reset Current">

-                <menu_item_call.on_click

-                 function="Inventory.ResetFilter" />

-            </menu_item_call>

-            <menu_item_call

-             label="Close All Folders"

-             layout="topleft"

-             name="Close All Folders">

-                <menu_item_call.on_click

-                 function="Inventory.CloseAllFolders" />

-            </menu_item_call>

-            <menu_item_separator

-             layout="topleft"

-             name="separator3" />

-            <menu_item_call

-             label="Empty Trash"

-             layout="topleft"

-             name="Empty Trash">

-                <menu_item_call.on_click

-                 function="Inventory.EmptyTrash" />

-            </menu_item_call>

-            <menu_item_call

-             label="Empty Lost And Found"

-             layout="topleft"

-             name="Empty Lost And Found">

-                <menu_item_call.on_click

-                 function="Inventory.EmptyLostAndFound" />

-            </menu_item_call>

-        </menu>

-        <menu

-         height="121"

-         label="Create"

-         layout="topleft"

-         left="0"

-         mouse_opaque="false"

-         name="Create"

-         tear_off="true"

-         top="-201"

-         width="121">

-            <menu_item_call

-             label="New Folder"

-             layout="topleft"

-             name="New Folder">

-                <menu_item_call.on_click

-                 function="Inventory.DoCreate"

-                 parameter="category" />

-            </menu_item_call>

-            <menu_item_call

-             label="New Script"

-             layout="topleft"

-             name="New Script">

-                <menu_item_call.on_click

-                 function="Inventory.DoCreate"

-                 parameter="lsl" />

-            </menu_item_call>

-            <menu_item_call

-             label="New Note"

-             layout="topleft"

-             name="New Note">

-                <menu_item_call.on_click

-                 function="Inventory.DoCreate"

-                 parameter="notecard" />

-            </menu_item_call>

-            <menu_item_call

-             label="New Gesture"

-             layout="topleft"

-             name="New Gesture">

-                <menu_item_call.on_click

-                 function="Inventory.DoCreate"

-                 parameter="gesture" />

-            </menu_item_call>

-            <menu

-             height="175"

-             label="New Clothes"

-             layout="topleft"

-             left_delta="0"

-             mouse_opaque="false"

-             name="New Clothes"

-             top_pad="514"

-             width="125">

-                <menu_item_call

-                 label="New Shirt"

-                 layout="topleft"

-                 name="New Shirt">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="shirt" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Pants"

-                 layout="topleft"

-                 name="New Pants">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="pants" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Shoes"

-                 layout="topleft"

-                 name="New Shoes">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="shoes" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Socks"

-                 layout="topleft"

-                 name="New Socks">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="socks" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Jacket"

-                 layout="topleft"

-                 name="New Jacket">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="jacket" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Skirt"

-                 layout="topleft"

-                 name="New Skirt">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="skirt" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Gloves"

-                 layout="topleft"

-                 name="New Gloves">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="gloves" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Undershirt"

-                 layout="topleft"

-                 name="New Undershirt">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="undershirt" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Underpants"

-                 layout="topleft"

-                 name="New Underpants">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="underpants" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Alpha"

-                 layout="topleft"

-                 name="New Alpha">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="alpha" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Tattoo"

-                 layout="topleft"

-                 name="New Tattoo">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="tattoo" />

-                </menu_item_call>

-            </menu>

-            <menu

-             height="85"

-             label="New Body Parts"

-             layout="topleft"

-             left_delta="0"

-             mouse_opaque="false"

-             name="New Body Parts"

-             top_pad="514"

-             width="118">

-                <menu_item_call

-                 label="New Shape"

-                 layout="topleft"

-                 name="New Shape">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="shape" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Skin"

-                 layout="topleft"

-                 name="New Skin">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="skin" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Hair"

-                 layout="topleft"

-                 name="New Hair">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="hair" />

-                </menu_item_call>

-                <menu_item_call

-                 label="New Eyes"

-                 layout="topleft"

-                 name="New Eyes">

-                    <menu_item_call.on_click

-                     function="Inventory.DoCreate"

-                     parameter="eyes" />

-                </menu_item_call>

-            </menu>

-        </menu>

-        <menu

-         height="49"

-         label="Sort"

-         layout="topleft"

-         left="0"

-         mouse_opaque="false"

-         name="Sort"

-         tear_off="true"

-         top="-113"

-         width="118">

-            <menu_item_check

-             control_name="Inventory.SortByName"

-             label="By Name"

-             layout="topleft"

-             name="By Name">

-                <menu_item_check.on_click

-                 function="Inventory.SetSortBy"

-                 parameter="name" />

-            </menu_item_check>

-            <menu_item_check

-             control_name="Inventory.SortByDate"

-             label="By Date"

-             layout="topleft"

-             name="By Date">

-                <menu_item_check.on_click

-                 function="Inventory.SetSortBy"

-                 parameter="date" />

-            </menu_item_check>

-            <menu_item_separator

-             layout="topleft" />

-            <menu_item_check

-             control_name="Inventory.FoldersAlwaysByName"

-             label="Folders Always By Name"

-             layout="topleft"

-             name="Folders Always By Name">

-                <menu_item_check.on_click

-                 function="Inventory.SetSortBy"

-                 parameter="foldersalwaysbyname" />

-            </menu_item_check>

-            <menu_item_check

-             control_name="Inventory.SystemFoldersToTop"

-             label="System Folders To Top"

-             layout="topleft"

-             name="System Folders To Top">

-                <menu_item_check.on_click

-                 function="Inventory.SetSortBy"

-                 parameter="systemfolderstotop" />

-            </menu_item_check>

-        </menu>

-    </menu_bar>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="all"
+ height="400"
+ label="Things"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ name="main inventory panel"
+ width="330">
+    <panel.string
+     name="Title">
+        Things
+    </panel.string>
+    <filter_editor
+     text_pad_left="12"
+     follows="left|top|right"
+	 font="SanSerif"
+     height="20"
+     label="Filter"
+     layout="topleft"
+     left="15"
+     name="inventory search editor"
+     top="34"
+     width="300" />
+    <tab_container
+     follows="left|top|right|bottom"
+     height="300"
+     layout="topleft"
+     left_delta="-4"
+     name="inventory filter tabs"
+     tab_position="top"
+     top_pad="4"
+     width="305">
+        <inventory_panel
+         follows="left|top|right|bottom"
+         height="295"
+         label="All Items"
+         layout="topleft"
+         left="1"
+         name="All Items"
+         top="16"
+         width="290" />
+        <inventory_panel
+         follows="left|top|right|bottom"
+         height="295"
+         label="Recent Items"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         top_delta="0"
+         width="290" />
+    </tab_container>
+
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     bottom="0"
+     follows="left|right|bottom"
+     height="30"
+     layout="bottomleft"
+     left="0"
+	 visible="true"
+     name="bottom_panel"
+     width="330">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="options_gear_btn"
+         picture_style="true"
+         top="6"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_btn"
+         picture_style="true"
+         tool_tip="Add new item"
+         width="18" />
+        <dnd_button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-5"
+         name="trash_btn"
+         picture_style="true"
+         tool_tip="Remove selected item"
+         top="6"
+         width="18" />
+    </panel>
+
+    <menu_bar
+     bg_visible="false"
+     follows="left|top|right"
+     height="18"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="Inventory Menu"
+     top="15"
+	 visible="true"
+     width="290">
+        <menu
+         height="101"
+         label="File"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="File"
+         tear_off="true"
+         top="-117"
+         width="128">
+            <menu_item_call
+             label="Open"
+             layout="topleft"
+             name="Open">
+                <menu_item_call.on_click
+                 function="Inventory.DoToSelected"
+                 parameter="open" />
+            </menu_item_call>
+            <menu
+             create_jump_keys="true"
+             label="Upload"
+             layout="topleft"
+             name="upload"
+             tear_off="true">
+                <menu_item_call
+                 label="Image (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Image"
+                 shortcut="control|U">
+                    <menu_item_call.on_click
+                     function="File.UploadImage"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Sound (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Sound">
+                    <menu_item_call.on_click
+                     function="File.UploadSound"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Animation (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Animation">
+                    <menu_item_call.on_click
+                     function="File.UploadAnim"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Bulk (L$[COST] per file)..."
+                 layout="topleft"
+                 name="Bulk Upload">
+                    <menu_item_call.on_click
+                     function="File.UploadBulk"
+                     parameter="" />
+                </menu_item_call>
+                <menu_item_separator
+                 layout="topleft" />
+            </menu>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="New Window"
+             layout="topleft"
+             name="New Window">
+                <menu_item_call.on_click
+                 function="Inventory.NewWindow" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft"
+             name="separator2" />
+            <menu_item_call
+             label="Show Filters"
+             layout="topleft"
+             name="Show Filters">
+                <menu_item_call.on_click
+                 function="Inventory.ShowFilters" />
+            </menu_item_call>
+            <menu_item_call
+             label="Reset Filters"
+             layout="topleft"
+             name="Reset Current">
+                <menu_item_call.on_click
+                 function="Inventory.ResetFilter" />
+            </menu_item_call>
+            <menu_item_call
+             label="Close All Folders"
+             layout="topleft"
+             name="Close All Folders">
+                <menu_item_call.on_click
+                 function="Inventory.CloseAllFolders" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft"
+             name="separator3" />
+            <menu_item_call
+             label="Empty Trash"
+             layout="topleft"
+             name="Empty Trash">
+                <menu_item_call.on_click
+                 function="Inventory.EmptyTrash" />
+            </menu_item_call>
+            <menu_item_call
+             label="Empty Lost And Found"
+             layout="topleft"
+             name="Empty Lost And Found">
+                <menu_item_call.on_click
+                 function="Inventory.EmptyLostAndFound" />
+            </menu_item_call>
+        </menu>
+        <menu
+         height="121"
+         label="Create"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="Create"
+         tear_off="true"
+         top="-201"
+         width="121">
+            <menu_item_call
+             label="New Folder"
+             layout="topleft"
+             name="New Folder">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="category" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Script"
+             layout="topleft"
+             name="New Script">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="lsl" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Note"
+             layout="topleft"
+             name="New Note">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="notecard" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Gesture"
+             layout="topleft"
+             name="New Gesture">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="gesture" />
+            </menu_item_call>
+            <menu
+             height="175"
+             label="New Clothes"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Clothes"
+             top_pad="514"
+             width="125">
+                <menu_item_call
+                 label="New Shirt"
+                 layout="topleft"
+                 name="New Shirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Pants"
+                 layout="topleft"
+                 name="New Pants">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="pants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Shoes"
+                 layout="topleft"
+                 name="New Shoes">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shoes" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Socks"
+                 layout="topleft"
+                 name="New Socks">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="socks" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Jacket"
+                 layout="topleft"
+                 name="New Jacket">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="jacket" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skirt"
+                 layout="topleft"
+                 name="New Skirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="skirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Gloves"
+                 layout="topleft"
+                 name="New Gloves">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="gloves" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Undershirt"
+                 layout="topleft"
+                 name="New Undershirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="undershirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Underpants"
+                 layout="topleft"
+                 name="New Underpants">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="underpants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Alpha"
+                 layout="topleft"
+                 name="New Alpha">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="alpha" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Tattoo"
+                 layout="topleft"
+                 name="New Tattoo">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="tattoo" />
+                </menu_item_call>
+            </menu>
+            <menu
+             height="85"
+             label="New Body Parts"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Body Parts"
+             top_pad="514"
+             width="118">
+                <menu_item_call
+                 label="New Shape"
+                 layout="topleft"
+                 name="New Shape">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shape" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skin"
+                 layout="topleft"
+                 name="New Skin">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="skin" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Hair"
+                 layout="topleft"
+                 name="New Hair">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="hair" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Eyes"
+                 layout="topleft"
+                 name="New Eyes">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="eyes" />
+                </menu_item_call>
+            </menu>
+        </menu>
+        <menu
+         height="49"
+         label="Sort"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="Sort"
+         tear_off="true"
+         top="-113"
+         width="118">
+            <menu_item_check
+             control_name="Inventory.SortByName"
+             label="By Name"
+             layout="topleft"
+             name="By Name">
+                <menu_item_check.on_click
+                 function="Inventory.SetSortBy"
+                 parameter="name" />
+            </menu_item_check>
+            <menu_item_check
+             control_name="Inventory.SortByDate"
+             label="By Date"
+             layout="topleft"
+             name="By Date">
+                <menu_item_check.on_click
+                 function="Inventory.SetSortBy"
+                 parameter="date" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_check
+             control_name="Inventory.FoldersAlwaysByName"
+             label="Folders Always By Name"
+             layout="topleft"
+             name="Folders Always By Name">
+                <menu_item_check.on_click
+                 function="Inventory.SetSortBy"
+                 parameter="foldersalwaysbyname" />
+            </menu_item_check>
+            <menu_item_check
+             control_name="Inventory.SystemFoldersToTop"
+             label="System Folders To Top"
+             layout="topleft"
+             name="System Folders To Top">
+                <menu_item_check.on_click
+                 function="Inventory.SetSortBy"
+                 parameter="systemfolderstotop" />
+            </menu_item_check>
+        </menu>
+    </menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 1ef845b769..ecf35523cd 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -23,11 +23,11 @@
      layout="topleft"
      left_delta="7"
      left="0"
-     max_length="254"
+     max_length="512"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="0"
-     width="250" />
+     width="279" />
     <output_monitor
      auto_update="true"
      follows="right"
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 34a185fb44..df37f9973c 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -10,7 +10,7 @@
   left="0"
   name="notification_panel"
   top="0"
-  	height="10"
+  	height="140"
   width="305">
   <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
   <panel
@@ -20,18 +20,18 @@
   bg_alpha_color="0.3 0.3 0.3 0"
   bg_opaque_color="0.3 0.3 0.3 0"
     follows="left|right|top"
-    height="10"
+    height="100"
     label="info_panel"
     layout="topleft"
     left="0"
     name="info_panel"
     top="0"
     width="305">
-  <!--  <text
+    <text
       border_visible="false"
       follows="left|right|top|bottom"
       font="SansSerif"
-      height="90"
+      height="85"
       layout="topleft"
       left="10"
       name="text_box"
@@ -39,21 +39,21 @@
       text_color="white"
       top="10"
       visible="false" 
-      width="300"
+      width="285"
       wrap="true"/>
     <text
       border_visible="false"
       follows="left|right|top|bottom"
       font="SansSerifBold"
-      height="90"
+      height="85"
       layout="topleft"
-      left="45"
+      left="10"
       name="caution_text_box"
       text_color="1 0.82 0.46 1"
-      top="5"
+      top="10"
       visible="false"
-      width="300"
-      wrap="true"/>  -->
+      width="285"
+      wrap="true"/>
     <text_editor
     	h_pad="0"
 	v_pad="0"
@@ -63,6 +63,7 @@
       enabled="false"
       follows="left|right|top|bottom"
       font="SansSerif"
+      height="85" 
       layout="topleft"
       left="10"
       mouse_opaque="false"
@@ -74,27 +75,19 @@
       top="10"
       visible="false"
       width="285"
-      wrap="true"/>
+      wrap="true"
+      parse_highlights="true"
+      allow_html="true"/>
   </panel>
   <panel
     background_visible="false"
     follows="left|right|bottom"
+    height="40" 
     label="control_panel"
     layout="topleft"
     left="0"
     left_delta="-38"
     name="control_panel"
-    top="20">
+    top_pad="0">
   </panel>
-  <!--
-  <icon
-    follows="left|top"
-    height="32"
-    image_name="notify_tip_icon.tga"
-    layout="topleft"
-    left="8"
-    mouse_opaque="false"
-    name="info_icon"
-    top="20"
-    width="32" />  -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..f511ec0d6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Outfits" 
+	  bottom="0" 
+	  height="326" 
+	  left="0" 
+	  width="310"
+	  border="true"
+	  follows="left|top|right|bottom">
+	 <inventory_panel 
+	 	 allow_multi_select="true" 
+		 border="true" 
+		 bottom="0"
+	     follows="left|top|right|bottom" 
+		 height="326" 
+		 left="0" 
+		 mouse_opaque="true"
+	     name="outfits_list"
+		 width="310"
+		 start_folder="My Outfits"/>
+	<button bottom="0"
+		 halign="center"
+		 height="16"
+		 label=">"
+		 enabled="false"
+	     mouse_opaque="false"
+		 name="selector"
+		 width="20"
+		 left="0"
+		 visible="false"
+	     follows="right|bottom"
+		 tool_tip="View outfit properties"/>
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     bottom="0"
+     follows="left|right|bottom"
+     height="30"
+     layout="bottomleft"
+     left="0"
+	 visible="true"
+     name="bottom_panel"
+     width="310">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="options_gear_btn"
+         picture_style="true"
+         top="6"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_btn"
+         picture_style="true"
+         tool_tip="Add new item"
+         width="18" />
+        <dnd_button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-5"
+         name="trash_btn"
+         picture_style="true"
+         tool_tip="Remove selected item"
+         top="6"
+         width="18" />
+    </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
new file mode 100644
index 0000000000..c8c79f8761
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_gear_default"
+ visible="false">
+    <menu_item_call
+     label="New Outfit"
+     layout="topleft"
+     name="new">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="new" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="new" />
+    </menu_item_call>
+    <menu_item_call
+     label="Wear Outfit"
+     layout="topleft"
+     name="wear">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="wear" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="wear" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete Outfit"
+     layout="topleft"
+     name="delete">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="delete" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="delete" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 9fac7d34f7..a370b450e9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -107,7 +107,10 @@ background_visible="true"
                  name="add_friend_btn"
                  top_delta="0"
                  tool_tip="Add selected resident to your friends List"
-                 width="18" />
+                 width="18">
+               <commit_callback
+                  function="People.addFriend" />
+             </button>
             </panel>
         </panel>
         <panel
@@ -325,7 +328,10 @@ background_visible="true"
                  name="add_friend_btn"
                  top_delta="0"
                  tool_tip="Add selected resident to your friends List"
-                 width="18" />
+                 width="18">
+                <commit_callback
+                   function="People.addFriend" />
+              </button>
             </panel>
         </panel>
     </tab_container>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 7ff227ecb6..023b1fc81d 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -12,24 +12,24 @@
      follows="all"
      height="85"
      image_name="ListItem_Over"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="hovered_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308" />
     <icon
      follows="all"
      height="85"
      image_name="ListItem_Select"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="selected_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308" />
     <texture_picker
      allow_no_texture="true"
      border_enabled="true"
@@ -47,36 +47,34 @@
      width="90" />
     <text
      follows="top|left|right"
-     font="SansSerifSmallBold"
-     height="16"
+     font="SansSerifSmall"
+     height="15"
      layout="topleft"
      left="110"
      name="picture_name"
      text_color="white"
      top="9"
-     use_ellipses="false"
-     width="197"
+     use_ellipses="true"
+     width="193"
      word_wrap="false" />
     <expandable_text
      follows="top|left|right"
      font="SansSerifSmall"
-     height="40"
+     height="55"
      layout="topleft"
-     left="110"
+     left="103"
      name="picture_descr"
-     top_pad="3"
+     top_pad="0"
      width="178"
      word_wrap="true" />
-    <button
-     follows="top|right"
-     height="16"
-     image_selected="BuyArrow_Press"
-     image_pressed="BuyArrow_Press"
-     image_unselected="BuyArrow_Press"
+         <button
+     follows="right"
+     height="20"
+     image_overlay="ForwardArrow_Off"
      layout="topleft"
+     left_pad="5"
+     right="-8"
      name="info_chevron"
-     right="-7"
-     tab_stop="false"
-     top="27"
-     width="16" />
+     top_delta="15"
+     width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 9cfbed432a..5cefe3e4ab 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -14,7 +14,18 @@
  <string
   name="no_classifieds"
   value="No Classifieds" />
-     
+ <text
+  type="string"
+  follows="all"
+  height="535"
+  layout="topleft"
+  left="6"
+  name="empty_picks_panel_text"
+  top="10"
+  visible="false" 
+  width="313">
+   There are no any picks/classifieds here
+ </text>
  <accordion
   follows="all"
   height="465"
@@ -120,7 +131,7 @@
        <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Info"
          layout="topleft"
@@ -132,7 +143,7 @@
         <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Teleport"
          layout="topleft"
@@ -144,7 +155,7 @@
         <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Map"
          layout="topleft"
@@ -156,7 +167,7 @@
         <button
          enabled="false"
          follows="bottom|right"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="▼"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index e6084202d7..9ab5c6b4f7 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -172,7 +172,7 @@
      width="313">
         <panel
          bg_alpha_color="DkGray2"
-         follows="all"
+         follows="left|top|right"
          height="533"
          layout="topleft"
          left="0"
@@ -192,7 +192,7 @@
             <layout_stack
              border_size="0"
              clip="false"
-             follows="all"
+             follows="left|top|right"
              height="50"
              layout="topleft"
              mouse_opaque="false"
@@ -305,7 +305,7 @@
              top_delta="0"
              width="18" />
             <text
-             follows="right|top"
+             follows="left|top|right"
              height="16"
              layout="topleft"
              left_pad="8"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index a6ca73d4b7..6bb937e3c6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -66,11 +66,7 @@
          label="Italiano (Italian) - Beta"
          name="Italian"
          value="it" />
-        <combo_box.item
-         enabled="true"
-         label="Magyar (Hungarian) - Beta"
-         name="Hungarian"
-         value="hu" />
+
         <combo_box.item
          enabled="true"
          label="Nederlands (Dutch) - Beta"
@@ -86,36 +82,16 @@
          label="Portugués (Portuguese) - Beta"
          name="Portugese"
          value="pt" />
-        <combo_box.item
-         enabled="true"
-         label="Русский (Russian) - Beta"
-         name="Russian"
-         value="ru" />
-        <combo_box.item
-         enabled="true"
-         label="Türkçe (Turkish) - Beta"
-         name="Turkish"
-         value="tr" />
-        <combo_box.item
-         enabled="true"
-         label="Українська (Ukrainian) - Beta"
-         name="Ukrainian"
-         value="uk" />
-        <combo_box.item
-         enabled="true"
-         label="中文 (简体) (Chinese) - Beta"
-         name="Chinese"
-         value="zh" />
+
+
+
+
         <combo_box.item
          enabled="true"
          label="日本語 (Japanese) - Beta"
          name="(Japanese)"
          value="ja" />
-        <combo_box.item
-         enabled="true"
-         label="한국어 (Korean) - Beta"
-         name="(Korean)"
-         value="ko" />
+
         <combo_box.item
          enabled="true"
          label="Test Language"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 9b10edde33..eb00b9b79a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -16,81 +16,8 @@
      height="12"
      layout="topleft"
      left="30"
-     name="WindowSizeLabel"
-     top="10"
-     width="300">
-        Window size:
-    </text>
-    <check_box
-     control_name="WindowFullScreen"
-     height="16"
-     label="Use fullscreen"
-     layout="topleft"
-     left_delta="50"
-     name="windowed mode"
-     top_pad="4"
-     width="175">
-    </check_box>
-	<combo_box
-	 visiblity_control="WindowFullScreen"
-	 allow_text_entry="false"
-	 enabled="true"
-	 layout="topleft"
-	 height="18"
-	 left_delta="220"
-	 max_chars="20"
-	 mouse_opaque="true"
-	 name="windowsize combo"
-	 top_delta="-1"
-	 width="150">
-		<combo_box.item
-		 type="string"
-	     length="1"
-	     enabled="true"
-	     name="640x480"
-	     value="640 x 480"
-	     label="640x480"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="800x600"
-	     value="800 x 600"
-	     label="800x600"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="720x480"
-	     value="720 x 480"
-	     label="720x480 (NTSC)"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="768x576"
-	     value="768 x 576"
-	     label="768x576 (PAL)"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="1024x768"
-	     value="1024 x 768"
-	     label="1024x768"/>
-	    <combo_box.commit_callback
-	     function="Pref.setControlFalse"
-	     parameter="FullScreenAutoDetectAspectRatio" />
- 	</combo_box>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
      name="UI Size:"
-     top_pad="4"
+     top="10"
      width="300">
         UI size:
     </text>
@@ -101,7 +28,7 @@
      follows="left|top"
      height="15"
      increment="0.025"
-     initial_value="1"
+     initial_valu="1"
      layout="topleft"
      left_delta="52"
      max_val="1.4"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 8c22a5e483..1b9a99f90b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -100,61 +100,27 @@
         Logs:
     </text>
     <check_box
-   
+	 enabled="false"
+     control_name="LogChat"
+     height="16"
+     label="Save nearby chat logs on my computer"
+     layout="topleft"
+     left="30"
+     name="log_nearby_chat"
+     top_pad="10"
+     width="350">
+    </check_box>
+    <check_box
 	 enabled="false"
      control_name="LogInstantMessages"
      height="16"
-     label="Save logs on my computer"
+     label="Save IM logs on my computer"
      layout="topleft"
      left="30"
      name="log_instant_messages"
      top_pad="10"
      width="350">
-        <check_box.commit_callback
-         function="Pref.Logging" />
     </check_box>
-   <radio_group
-     control_name="IMLogOptions"
-     enabled="false"
-     height="80"
-     layout="topleft"
-     left_delta="50"
-     name="ChatIMLogs"
-     width="350"
-     top_pad="0">
-        <radio_item
-         height="16"
-         label="Chat"
-         layout="topleft"
-         left="0"
-         name="radio1"
-         top="3"
-         width="200" />
-        <radio_item
-         height="16"
-         label="IM"
-         layout="topleft"
-         left_delta="0"
-         name="radio2"
-         top_pad="3"
-         width="200" />
-        <radio_item
-         height="16"
-         label="Both, together"
-         layout="topleft"
-         left_delta="0"
-         name="radio3"
-         top_pad="3"
-         width="200" />
-        <radio_item
-         height="16"
-         label="Both, separate"
-         layout="topleft"
-         left_delta="0"
-         name="radio4"
-         top_pad="3"
-         width="200" />
-    </radio_group>
     <check_box
      control_name="LogTimestamp"
 	 enabled="false"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 9cf0bd26d8..5cabae5fa0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -169,12 +169,12 @@
      decimal_digits="0"
      follows="left|top"
      height="15"
-     increment="10"
-     initial_value="50"
+     increment="16"
+     initial_value="512"
      layout="topleft"
      left_delta="150"
-     max_val="1000"
-     min_val="10"
+     max_val="1024"
+     min_val="32"
      name="cache_size"
      top_delta="-1"
      width="180" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d454b9e5c8..8ef2cdfc37 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -350,7 +350,7 @@
      border="false"
      follows="top|left"
      height="145"
-     label="DeviceSettings"
+     label="Device Settings"
      layout="topleft"
      left="0"
      name="device_settings_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 3bdd7114ee..98025e28db 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -2,19 +2,18 @@
 <panel
 	follows="left|right|top|bottom"
 	name="MediaControls"
-	bg_alpha_color="1 1 1 0"
+	background_visible="false"
 	height="160"
 	layout="topleft"
 	mouse_opaque="false"
 	width="800">
+  <string name="control_background_image_name">Inspector_Background</string>
   <panel
 	  name="media_region"
 	  bottom="125"
 	  follows="left|right|top|bottom"
 	  layout="topleft"
-	  left="20"
 	  mouse_opaque="false"
-	  right="-20"
 	  top="20" />
   <layout_stack
 	  follows="left|right|bottom"
@@ -33,6 +32,7 @@
 		name="media_progress_indicator"
 		height="22"
 		layout="topleft"
+		visible="false"
 		left="0"
 		top="0"
 		auto_resize="false"
@@ -64,6 +64,7 @@
 	  top="128">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
+		name="left_bookend"
 		width="0"
 		layout="topleft"
 		user_resize="false" />
@@ -76,13 +77,18 @@
 		width="22"
 		top="4">
 	  <button
+		  image_overlay="Arrow_Left_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  auto_resize="false"
 		  height="22"
-		  image_selected="media_btn_back.png"
-		  image_unselected="media_btn_back.png"
 		  layout="topleft"
 		  tool_tip="Step back"
 		  width="22"
+		  left="0"
 		  top_delta="4">
 		<button.commit_callback
 			function="MediaCtrl.Back" />
@@ -94,37 +100,25 @@
 		user_resize="false"
 		layout="topleft"
 		top="10"
-		min_width="17"
-		width="17">
+		min_width="22"
+		width="22">
 	  <button
+		  image_overlay="Arrow_Right_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_forward.png"
-		  image_unselected="media_btn_forward.png"
 		  layout="topleft"
 		  tool_tip="Step forward"
 		  top_delta="0"
-		  min_width="17"
-		  width="17">
+		  min_width="22"
+		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Forward" />
 	  </button>
 	</layout_panel>
-<!--
-	<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="22"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
--->
 	<layout_panel
 		name="home"
 		auto_resize="false"
@@ -134,11 +128,15 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="media_btn_home.png"
-		  image_unselected="media_btn_home.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_overlay="Home_Off"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Home page"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -153,10 +151,15 @@
 		top="2"
 		min_width="22"
 		width="22">
+	  <!-- The stop button here is temporary artwork -->
 	  <button
+		  image_overlay="media_btn_stoploading.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="button_anim_stop.tga"
-		  image_unselected="button_anim_stop.tga"
 		  layout="topleft"
 		  tool_tip="Stop media"
 		  min_width="22"
@@ -165,22 +168,6 @@
 			function="MediaCtrl.Stop" />
 	  </button>
 	</layout_panel>
-<!--
-	<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="22"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
--->
 	<layout_panel
 		name="reload"
 		auto_resize="false"
@@ -191,8 +178,12 @@
 		width="22">
 	  <button
 		  height="22"
-		  image_selected="media_btn_reload.png"
-		  image_unselected="media_btn_reload.png"
+		  image_overlay="Refresh_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Reload"
 		  min_width="22"
@@ -211,8 +202,12 @@
 		width="22">
 	  <button
 		  height="22"
-		  image_selected="media_btn_stoploading.png"
-		  image_unselected="media_btn_stoploading.png"
+		  image_overlay="StopReload_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Stop loading"
 		  min_width="22"
@@ -230,11 +225,15 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="button_anim_play.tga"
-		  image_unselected="button_anim_play.tga"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Play media"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -250,10 +249,14 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="button_anim_pause.tga"
-		  image_unselected="button_anim_pause.tga"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
+		  height="22"
 		  tool_tip = "Pause media">
 		<button.commit_callback
 			function="MediaCtrl.Pause" />
@@ -264,7 +267,7 @@
 		name="media_address"
 		auto_resize="true"
 		user_resize="false"
-		height="22"
+		height="24"
 		follows="left|right|bottom"
 		layout="topleft"
 		width="190"
@@ -294,31 +297,43 @@ function="MediaCtrl.CommitURL" />
 			function="MediaCtrl.CommitURL"/>
 	  </line_editor>
 	  <layout_stack
+		  name="media_address_url_icons"
 		  animate="false"
 		  follows="right"
-		  width="32"
-		  min_width="32"
-		  height="16"
-		  top="3"
-		  orientation="horizontal"
-		  left_pad="-38">
-		<icon
-			name="media_whitelist_flag"
-			follows="top|right"
-			height="16"
-			image_name="smicon_warn.tga"
+		  height="20"
+		  width="38"
+		  right="-2"
+		  top="-1"
+		  orientation="horizontal">
+		<layout_panel
 			layout="topleft"
-			tool_tip="White List enabled"
-			min_width="16"
-			width="16" />
-		<icon
-			name="media_secure_lock_flag"
-			height="16"
-			image_name="inv_item_eyes.tga"
+			width="16"
+			auto_resize="false"
+			user_resize="false">
+		  <icon
+			  name="media_whitelist_flag"
+			  follows="top|right"
+			  height="16"
+			  image_name="Flag"
+			  layout="topleft"
+			  tool_tip="White List enabled"
+			  min_width="16"
+			  width="16" />
+		</layout_panel>
+		<layout_panel
 			layout="topleft"
-			tool_tip="Secured Browsing"
-			min_width="16"
-			width="16" />
+			width="16"
+			auto_resize="false"
+			user_resize="false">
+		  <icon
+			  name="media_secure_lock_flag"
+			  height="16"
+			  image_name="Lock2"
+			  layout="topleft"
+			  tool_tip="Secured Browsing"
+			  min_width="16"
+			  width="16" />
+		</layout_panel>
 	  </layout_stack>
 	</layout_panel>
 	<layout_panel
@@ -337,6 +352,7 @@ function="MediaCtrl.CommitURL" />
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
+		  top="8"
 		  min_width="100"
 		  width="200">
 		<slider_bar.commit_callback
@@ -348,43 +364,55 @@ function="MediaCtrl.CommitURL" />
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		height="24"
-		min_width="24"
-		width="24">
+		height="22"
+		min_width="22"
+		width="22">
+	  <!-- Note: this isn't quite right either...the mute button is not the -->
+	  <!-- same as the others because it can't have the "image_overlay" be  -->
+	  <!-- two different images.  -->
 	  <button
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  hover_glow_amount="0.15"
 		  name="media_volume_button"
 		  height="22"
-		  image_selected="icn_speaker-muted_dark.tga"
-		  image_unselected="icn_speaker_dark.tga"
 		  is_toggle="true"
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top_delta="22"
-		  min_width="24"
-		  width="24" >
+		  top_delta="18"
+		  min_width="22"
+		  width="22" >
 		<button.commit_callback
 			function="MediaCtrl.ToggleMute" />
 	  </button>
 	</layout_panel>
+	<!-- We don't have a design yet for "volume", so this is a temporary -->
+	<!-- solution.  See DEV-42827. -->
 	<layout_panel
 		name="volume_up"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		min_width="20"
+		min_width="14"
 		height="14"
-		width="20">
+		width="14">
 	  <button
-		  top="-3"
+		  image_overlay="media_btn_scrollup.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  top="-5"
 		  height="14"
-		  image_selected="media_btn_scrollup.png"
-		  image_unselected="media_btn_scrollup.png"
 		  layout="topleft"
 		  tool_tip="Volume up"
 		  scale_image="true"
-		  min_width="20"
-		  width="20" >
+		  min_width="14"
+		  width="14" >
 		<button.commit_callback
 			function="MediaCtrl.CommitVolumeUp" />
 	  </button>
@@ -394,26 +422,32 @@ function="MediaCtrl.CommitURL" />
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		min_width="20"
+		min_width="14"
 		height="14"
-		width="20">
+		width="14">
 	  <button
-		  top="-5"
-		  height="14"
-		  image_selected="media_btn_scrolldown.png"
-		  image_unselected="media_btn_scrolldown.png"
+		  image_overlay="media_btn_scrolldown.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Volume down"
 		  scale_image="true"
-		  min_width="20"
-		  width="20">
+		  top="-5"
+		  height="14"
+		  min_width="14"
+		  width="14">
 		<button.commit_callback
 			function="MediaCtrl.CommitVolumeDown" />
 	  </button>
 	</layout_panel>
 	<!-- Scroll pad -->
-<!--
-disabled
+	<!-- This was removed from the design, but is still here because it is --> 
+	<!-- complex, and recreating it would be hard.  In case the design -->
+	<!-- changes, here it lies: --> 
+	<!--
 	<layout_panel
 		name="media_panel_scroll"
 		auto_resize="false"
@@ -479,8 +513,21 @@ disabled
 		  min_width="8"
 		  width="8" />
 	</layout_panel>
-disabled
--->
+	-->
+	<panel
+		height="28"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="26"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
 	<layout_panel
 		name="zoom_frame"
 		auto_resize="false"
@@ -490,9 +537,13 @@ disabled
 		min_width="22"
 		width="22">
 	  <button
+		  image_overlay="Zoom_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_optimalzoom.png"
-		  image_unselected="media_btn_optimalzoom.png"
 		  layout="topleft"
 		  tool_tip="Zoom into media"
 		  min_width="22"
@@ -508,10 +559,15 @@ disabled
 		layout="topleft"
 		min_width="21"
 		width="21" >
+	  <!-- There is no "Zoom out" icon, so we use this temporarily -->
 	  <button
+		  image_overlay="ForwardArrow_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_done.png"
-		  image_unselected="media_btn_done.png"
 		  layout="topleft"
 		  tool_tip ="Zoom Back"
 		  top_delta="-4"
@@ -520,22 +576,6 @@ disabled
 			function="MediaCtrl.Close" />
 	  </button>
 	</layout_panel>
-<!--
-	<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="22"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
--->
 	<layout_panel
 		name="new_window"
 		auto_resize="false"
@@ -544,35 +584,25 @@ disabled
 		min_width="22"
 		width="22">
 	  <button
+		  image_overlay="ExternalBrowser_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_newwindow.png"
-		  image_unselected="media_btn_newwindow.png"
 		  layout="topleft"
 		  tool_tip = "Open URL in browser"
-		  top_delta="-3"
+		  top_delta="-4"
 		  min_width="24"
 		  width="24" >
 		<button.commit_callback
 			function="MediaCtrl.Open" />
 	  </button>
 	</layout_panel>
-<!--
-	<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="22"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
--->
+	<!-- bookend panel -->
 	<layout_panel
+		name="right_bookend"
 		width="0"
 		layout="topleft"
 		user_resize="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 0f5e96416d..5110b6b2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -283,7 +283,7 @@
          mouse_opaque="false"
          name="add_friend"
          top="5"
-         width="75" />
+         width="76" />
         <button
          follows="bottom|left"
          height="19"
@@ -292,7 +292,7 @@
          name="im"
          top="5"
          left_pad="5"
-         width="45" />
+         width="31" />
         <button
          follows="bottom|left"
          height="19"
@@ -301,7 +301,7 @@
          name="call"
          left_pad="5"
          top="5"
-         width="45" />
+         width="40" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -311,7 +311,7 @@
          name="show_on_map_btn"
          top="5"
          left_pad="5"
-         width="45" />
+         width="42" />
         <button
          follows="bottom|left"
          height="19"
@@ -320,7 +320,17 @@
          name="teleport"
          left_pad="5"
          top="5"
-         width="80" />
+         width="64" />
+        <button
+         follows="bottom|right"
+         font="SansSerifSmall"
+         height="19"
+         label="▼"
+         layout="topleft"
+         name="overflow_btn"
+         right="-1"
+         top="5"
+         width="21" />
  </panel>
  <panel
      follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index a419a02d75..d02354a647 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -120,9 +120,9 @@
     background_visible="true"
   >
       <panel
-        class="panel_appearance"
-        name="panel_appearance"
-        filename="panel_appearance.xml"
+        class="sidepanel_appearance"
+        name="sidepanel_appearance"
+        filename="sidepanel_appearance.xml"
         label="Edit Appearance"
         font="SansSerifBold"
       />
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 9636e32187..9839075862 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -7,6 +7,24 @@
  layout="topleft"
  name="home_tab"
  width="333">
+  <scroll_container
+   color="DkGray"
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="profile_scroll"
+   opaque="true"
+   height="560"
+   width="333"
+   top="0">
+  <panel
+   background_visible="true"
+   height="560"
+   layout="topleft"
+   name="profile_scroll_panel"
+   top="0"
+   left="0"
+   width="311">
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
@@ -227,7 +245,7 @@
          right="-10"
          top="10"
          width="20"
-         image_name="TabIcon_Inventory_Selected"/>
+         image_name="TabIcon_Things_Selected"/>
         <text
          follows="all"
          height="90"
@@ -242,4 +260,6 @@
             Browse your inventory.
         </text>
     </panel>
+  </panel>
+  </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 1171a8f0b5..b1afe76500 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -46,30 +46,42 @@
      font="SansSerifSmall"
      image_selected="BuyArrow_Over"
      image_unselected="BuyArrow_Off"
-	image_pressed="BuyArrow_Press"
+     image_pressed="BuyArrow_Press"
      height="16"
-     left="-220"
+     left="-200"
      name="buycurrency"
-     pad_right="22px"
+     pad_right="20px"
      tool_tip="My Balance: Click to buy more L$"
      top="1"
-     width="117" />
+     width="90" />
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|bottom"
      halign="right"
      height="16"
-     top="3"
+     top="5"
      layout="topleft"
-     left_pad="15"
+     left_pad="-5"
      name="TimeText"
      text_color="TimeTextColor"
      tool_tip="Current time (Pacific)"
      width="80">
         12:00 AM
     </text>
+    <button
+     follows="right|bottom"
+     height="16"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
+     is_toggle="true"
+     left_pad="5"
+     top="1"
+     name="volume_btn"
+     tool_tip="Global Volume Control"
+     width="16" />
     <text
      enabled="true"
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 7722583ce2..ccb57b6552 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -9,7 +9,10 @@
   width="300"
   height="35"
   layout="topleft"
-  follows="left|right">
+  follows="left|right"
+  background_opaque="false"
+  background_visible="true"
+  bg_alpha_color="0.0 0.0 0.0 0.0" >
   <text
     top="2"
     left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index 1f67a0a732..3384852f27 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -18,7 +18,7 @@
      visible="false"
      width="380" />
     <icon
-     height="24"
+     height="20"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
@@ -26,7 +26,7 @@
      name="selected_icon"
      top="0"
      visible="false"
-     width="320" />
+     width="380" />
     <icon
      height="16"
      follows="top|left"
@@ -46,7 +46,7 @@
      text_color="white"
      top="4"
      value="..."
-     width="242" />
+     width="330" />
     <button
      follows="right"
      height="20"
@@ -55,7 +55,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
-     top_delta="-2"
+     top="1"
      visible="false"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 7f7777586c..f16329f8d7 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
-<!-- All this does is establish the position of the "close" button on the toast. -->
+<!-- Don't remove floater's height! It is needed for Overflow and Start-Up toasts!-->
 
 <floater
  legacy_header_height="18"
@@ -9,6 +9,7 @@
 	title=""
   visible="false"
   layout="topleft"
+  height="40" 
 	width="305"
   left="0"
   top="0"
@@ -26,36 +27,21 @@
   drop_shadow_visible = "false"
   border = "false"
   >
-
-  <!--
+  <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
   <text
    visible="false"
    follows="left|top|right|bottom"
    font="SansSerifBold"
-   height="40"
+   height="20"
    layout="topleft"
-   left="60"
+   left="20"
    name="toast_text"
    word_wrap="true"
    text_color="white"
-   top="20"
-   width="290">
+   top="5" 
+   width="260">
     Toast text;
   </text>
-  <icon
-    top="20"
-    left="10"
-    width="32"
-    height="32"
-    follows="top|left"
-    layout="topleft"
-    visible="false"
-    color="1 1 1 1"
-    enabled="true"
-    image_name="notify_tip_icon.tga"
-    mouse_opaque="true"
-    name="icon"
-  />-->
   <button
     layout="topleft"
     top="-6"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
new file mode 100644
index 0000000000..041297a542
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	  background_visible="true"
+	  follows="all"
+	  height="400"
+	  label="Appearance"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="appearance panel"
+	  width="333">
+     <string
+		 name="looks_tab_title"
+		 value="Outfits" />
+     <panel
+		 left="5" width="320" height="55"
+		 background_visible="true"
+		 background_opaque="false"
+		 bg_alpha_color="0.2 0.2 0.2 1.0"
+		 name="panel_currentlook"
+		 follows="left|top|right">
+		<text
+			 top="-5" width="200" left="5" height="10" follows="left|right|top"
+        	 font="SansSerif" text_color="LtGray" word_wrap="true"
+        	 mouse_opaque="false" name="currentlook_title">
+					Current Outfit
+    	</text>
+  		<text
+			 top="-30" left="8" height="10" follows="left|right|top"
+      		 font="SansSerifBold" text_color="white" word_wrap="true"
+      		 mouse_opaque="false" name="currentlook_name" >
+					MyOutfit
+  		</text>
+  	    <button
+  	     	 follows="left|right|top"
+  	     	 font="SansSerif"
+  	     	 top="28" right="-105" width="60" height="20"
+  	     	 layout="topleft"
+  		 	 label="Edit"
+  	     	 name="editappearance_btn"/>
+	</panel>
+
+    <filter_editor
+  	     follows="left|top|right"
+  	     font="SansSerif"
+  	     label="Filter"
+  	     layout="topleft"
+  	     left="15" 
+		 width="313"
+		 height="20"
+  	     name="Filter" />
+    <panel
+   	     class="panel_outfits_inventory"
+   	     filename="panel_outfits_inventory.xml"
+ 	     name="panel_outfits_inventory"
+  	     follows="all"
+  	     height="271"
+  	     halign="center"
+  	     layout="topleft"
+  	     left="10"
+  	     top_pad="19"
+  	     width="313" />
+    <button
+  	     follows="bottom|left"
+     font="SansSerifSmall"
+  	     height="25"
+  	     label="Wear"
+  	     layout="topleft"
+  	     left="10"
+  	     name="wear_btn"
+     	 top_pad="0"
+       	 width="80" />
+    <button
+    	 follows="bottom|left"
+     font="SansSerifSmall"
+  	     height="25"
+  	     label="New Outfit"
+  	     layout="topleft"
+  	     left_pad="0"
+  	     name="newlook_btn"
+  	     top_delta="0"
+   	     width="90" />
+
+	<panel
+       	 class="panel_look_info"
+       	 filename="panel_look_info.xml"
+       	 follows="all"
+       	 layout="topleft"
+       	 left="0"
+       	 name="panel_look_info"
+       	 top="-200"
+       	 visible="false" />
+
+	<panel
+	   	 class="panel_edit_wearable"
+	   	 filename="panel_edit_wearable.xml"
+	   	 follows="all"
+	   	 layout="topleft"
+	   	 left="0"
+	   	 name="panel_edit_wearable"
+	   	 top="-200"
+	   	 visible="false"
+	   	 width="333" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index cbcc3f10ad..b8b3d993bd 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,127 +1,127 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel

-	  background_visible="true"

-	  follows="all"

-	  height="570"

-	  label="Things"

-	  layout="topleft"

-	  min_height="350"

-	  min_width="240"

-	  name="objects panel"

-	  width="333">

-	 <panel

-		 follows="all"

-		 layout="topleft"

-		 left="0"

-		 name="sidepanel__inventory_panel"

-		 top="0"

-		 label=""

-		 height="570"

-		 visible="true"

-		 width="330">

-		<panel

-			 class="panel_main_inventory"

-			 filename="panel_main_inventory.xml"

-			 follows="all"

-			 layout="topleft"

-			 left="0"

-			 name="panel_main_inventory"

-			 top="0"

-			 label=""

-			 height="500"

-			 width="330" />

-		<panel

-			 height="25"

-			 layout="bottomright"

-			 help_topic="item_button_tab"

-			 name="button_panel"

-			 left="5"

-			 bottom="5"

-			 width="313">

-			<button

-				 enabled="true"

-				 follows="bottom|left"

-				 font="SansSerifSmallBold"

-				 height="25"

-				 label="Info"

-				 layout="topleft"

-				 left="0"

-				 name="info_btn"

-				 top="0"

-				 width="60" />

-			<button

-				 enabled="true"

-				 follows="bottom|left"

-				 font="SansSerifSmallBold"

-				 height="25"

-				 label="Share"

-				 layout="topleft"

-				 left_pad="5"

-				 name="share_btn"

-				 top="0"

-				 width="60" />

-			<button

-				 enabled="false"

-				 follows="bottom|left"

-				 font="SansSerifSmallBold"

-				 height="25"

-				 label="Wear"

-				 layout="topleft"

-				 left="130"

-				 name="wear_btn"

-				 top="0"

-				 width="60" />

-			<button

-				 enabled="false"

-				 follows="bottom|left"

-				 font="SansSerifSmallBold"

-				 height="25"

-				 label="Play"

-				 layout="topleft"

-				 name="play_btn"

-				 left="130"

-				 top="0"

-				 width="50" />

-			<button

-				 enabled="false"

-				 follows="bottom|left"

-				 font="SansSerifSmallBold"

-				 height="25"

-				 label="Teleport"

-				 layout="topleft"

-				 left="130"

-				 name="teleport_btn"

-				 top="0"

-				 width="77" />

-		</panel>

-	</panel>

-

-	<panel

-		 follows="all"

-		 layout="topleft"

-		 left="0"

-		 class="sidepanel_item_info"

-		 filename="sidepanel_item_info.xml"

-		 name="sidepanel__item_panel"

-		 top="0"

-		 label=""

-		 height="570"

-		 visible="false"

-		 width="330">

-	</panel>

-

-	<panel

-		 follows="all"

-		 layout="topleft"

-		 left="0"

-		 class="sidepanel_task_info"

-		 filename="sidepanel_task_info.xml"

-		 name="sidepanel__task_panel"

-		 top="0"

-		 label=""

-		 height="570"

-		 visible="false"

-		 width="330">

-	</panel>

-

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	  background_visible="true"
+	  follows="all"
+	  height="570"
+	  label="Things"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="objects panel"
+	  width="333">
+	 <panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 name="sidepanel__inventory_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="true"
+		 width="330">
+		<panel
+			 class="panel_main_inventory"
+			 filename="panel_main_inventory.xml"
+			 follows="all"
+			 layout="topleft"
+			 left="0"
+			 name="panel_main_inventory"
+			 top="0"
+			 label=""
+			 height="500"
+			 width="330" />
+		<panel
+			 height="25"
+			 layout="bottomright"
+			 help_topic="item_button_tab"
+			 name="button_panel"
+			 left="5"
+			 bottom="5"
+			 width="313">
+			<button
+				 enabled="true"
+				 follows="bottom|left"
+				 font="SansSerifSmall"
+				 height="25"
+				 label="Info"
+				 layout="topleft"
+				 left="0"
+				 name="info_btn"
+				 top="0"
+				 width="60" />
+			<button
+				 enabled="true"
+				 follows="bottom|left"
+				 font="SansSerifSmall"
+				 height="25"
+				 label="Share"
+				 layout="topleft"
+				 left_pad="5"
+				 name="share_btn"
+				 top="0"
+				 width="60" />
+			<button
+				 enabled="false"
+				 follows="bottom|left"
+				 font="SansSerifSmall"
+				 height="25"
+				 label="Wear"
+				 layout="topleft"
+				 left="130"
+				 name="wear_btn"
+				 top="0"
+				 width="60" />
+			<button
+				 enabled="false"
+				 follows="bottom|left"
+				 font="SansSerifSmall"
+				 height="25"
+				 label="Play"
+				 layout="topleft"
+				 name="play_btn"
+				 left="130"
+				 top="0"
+				 width="50" />
+			<button
+				 enabled="false"
+				 follows="bottom|left"
+				 font="SansSerifSmall"
+				 height="25"
+				 label="Teleport"
+				 layout="topleft"
+				 left="130"
+				 name="teleport_btn"
+				 top="0"
+				 width="77" />
+		</panel>
+	</panel>
+
+	<panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 class="sidepanel_item_info"
+		 filename="sidepanel_item_info.xml"
+		 name="sidepanel__item_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="false"
+		 width="330">
+	</panel>
+
+	<panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 class="sidepanel_task_info"
+		 filename="sidepanel_task_info.xml"
+		 name="sidepanel__task_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="false"
+		 width="330">
+	</panel>
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 39cd75074e..6ae2477304 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,511 +1,511 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel

-	 auto_tile="true"

-	 height="570"

-	 layout="topleft"

-	 name="item properties"

-	 help_topic="item_properties"

-	 save_rect="true"

-	 title="Inventory Item Properties"

-	 width="333">

-	<panel.string

-		 name="unknown">

-        (unknown)

-	</panel.string>

-	<panel.string

-		 name="public">

-        (public)

-    </panel.string>

-	<panel.string

-    	 name="you_can">

-        You can:

-    </panel.string>

-	<panel.string

-    	 name="owner_can">

-        Owner can:

-    </panel.string>

-	<panel.string

-    	 name="acquiredDate">

-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]

-	</panel.string>

-	<icon

-     	 follows="top|right"

-     	 height="18"

-     	 image_name="Lock"

-	     layout="topleft"

-		 right="-50"

-	     mouse_opaque="true"

-	     name="IconLocked"

-	     top="4"

-	     width="18" />

-    <button

-	     follows="top|right"

-	     height="25"

-	     image_overlay="BackArrow_Off"

-	     layout="topleft"

-	     name="back_btn"

-	     picture_style="true"

-	     right="-5"

-	     tab_stop="false"

-	     top="0"

-	     width="25" />

-	<panel

-         follows="all"

-         height="500"

-         label=""

-         layout="topleft"

-         left="5"

-         help_topic=""

-         top="30"

-		 border="1"

-         width="313">

-	    <text	 	 	 

-		     type="string"

-		     length="1"

-		     follows="left|top"

-		     height="10"

-		     layout="topleft"

-		     left="5"

-		     name="LabelItemNameTitle"

-		     top="5"

-		     width="78">

-	        Name:

-	    </text>

-    	<line_editor

-		     border_style="line"

-		     border_thickness="1"

-	    	 follows="left|top|right"

-		     height="16"

-		     layout="topleft"

-	    	 left_delta="78"

-		     max_length="63"

-		     name="LabelItemName"

-	    	 top_delta="0"

-		     width="225" />

-	    <text

-		     type="string"

-		     length="1"

-	    	 follows="left|top"

-	    	 height="10"

-		     layout="topleft"

-    		 left="5"

-		     name="LabelItemDescTitle"

-    		 top_delta="20"

-	    	 width="78">

-	        Description:

-	    </text>

-	    <line_editor

-		     border_style="line"

-    		 border_thickness="1"

-	    	 follows="left|top|right"

-	    	 height="16"

-		     layout="topleft"

-    		 left_delta="78"

-		     max_length="127"

-    		 name="LabelItemDesc"

-	    	 top_delta="0"

-	    	 width="225" />

-	    <text

-		     type="string"

-		     length="1"

-		     follows="left|top"

-		     height="16"

-		     layout="topleft"

-		     left="10"

-		     name="LabelCreatorTitle"

-		     top="65"

-		     width="78">

-	        Creator:

-    	</text>

-	    <text

-		     type="string"

-		     length="1"

-		     follows="left|top"

-		     height="16"

-		     layout="topleft"

-		     left_delta="78"

-		     name="LabelCreatorName"

-		     top_delta="0"

-		     width="200">

-	        Nicole Linden

-	     </text>

-	     <button

-			 follows="top|right"

-			 font="SansSerifSmall"

-			 height="16"

-			 label="Profile..."

-			 layout="topleft"

-			 left_delta="144"

-			 name="BtnCreator"

-			 top_delta="0"

-			 width="78" />

-	     <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="16"

-			 layout="topleft"

-			 left="10"

-			 name="LabelOwnerTitle"

-			 top="85"

-			 width="78">

-			    Owner:

-	     </text>

-	     <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="16"

-			 layout="topleft"

-			 left_delta="78"

-			 name="LabelOwnerName"

-			 top_delta="0"

-			 width="200">

-			    Thrax Linden

-	     </text>

-	     <button

-			 follows="top|right"

-			 font="SansSerifSmall"

-			 height="16"

-			 label="Profile..."

-			 layout="topleft"

-			 left_delta="144"

-			 name="BtnOwner"

-			 top_delta="0"

-			 width="78" />

-	     <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="16"

-			 layout="topleft"

-			 left="10"

-			 name="LabelAcquiredTitle"

-			 top="105"

-			 width="78">

-			Acquired:

-	     </text>

-	     <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="16"

-			 layout="topleft"

-			 left_delta="78"

-			 name="LabelAcquiredDate"

-			 top_delta="0"

-			 width="252">

-			Wed May 24 12:50:46 2006

-	    </text>

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="OwnerLabel"

-			 top="125"

-			 width="78">

-			You:

-	    </text>

-	    <check_box

-			 height="16"

-			 label="Edit"

-			 layout="topleft"

-			 left_pad="5"

-			 name="CheckOwnerModify"

-			 top_delta="0"

-			 width="78" />

-	    <check_box

-			 height="16"

-			 label="Copy"

-			 layout="topleft"

-			 left_delta="0"

-			 name="CheckOwnerCopy"

-			 top_pad="5"

-			 width="88" />

-	    <check_box

-			 height="16"

-			 label="Resell"

-			 layout="topleft"

-			 left_delta="0"

-			 name="CheckOwnerTransfer"

-			 top_pad="5"

-			 width="106" />

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="AnyoneLabel"

-			 top_pad="5"

-			 width="78">

-			Anyone:

-	    </text>

-	    <check_box

-			 height="16"

-			 label="Copy"

-			 layout="topleft"

-			 left_pad="5"

-			 name="CheckEveryoneCopy"

-			 top_delta="0"

-			 width="130" />

-    	<text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="GroupLabel"

-			 top_pad="5"

-			 width="78">

-			Group:

-    	</text>

-	    <check_box

-			 height="16"

-			 label="Share"

-			 layout="topleft"

-			 left_pad="5"

-			 name="CheckShareWithGroup"

-			 top_delta="5"

-			 width="106" />

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="NextOwnerLabel"

-			 top_pad="5"

-			 width="78">

-			Next owner:

-	    </text>

-	    <check_box

-			 height="16"

-			 label="Edit"

-			 layout="topleft"

-			 left_pad="5"

-			 name="CheckNextOwnerModify"

-			 top_delta="0"

-			 width="78" />

-	    <check_box

-			 height="16"

-			 label="Copy"

-			 layout="topleft"

-			 left_delta="0"

-			 name="CheckNextOwnerCopy"

-			 top_pad="5"

-			 width="88" />

-	    <check_box

-			 height="16"

-			 label="Resell"

-			 layout="topleft"

-			 left_delta="0"

-			 name="CheckNextOwnerTransfer"

-			 top_pad="5"

-			 width="106" />

-	    <check_box

-			 height="16"

-			 label="For Sale"

-			 layout="topleft"

-			 left="10"

-			 name="CheckPurchase"

-			 top_pad="5"

-			 width="78" />

-		<combo_box

-			 height="19"

-			 left_pad="5"

-			 layout="topleft"

-			 follows="left|top"

-			 name="combobox sale copy"

-			 width="90">

-			<combo_box.item

-			     label="Copy"

-			     name="Copy"

-			     value="Copy" />

-			<combo_box.item

-			     label="Original"

-			     name="Original"

-			     value="Original" />

-	    </combo_box>

-	    <spinner

-			    follows="left|top"

-			    decimal_digits="0"

-			    increment="1"

-			    control_name="Edit Cost"

-			    name="Edit Cost"

-			    label="Price: L$"

-			    label_width="60"

-			    left="10"

-			    width="180"

-			    min_val="1"

-			    height="19"

-			    max_val="999999999"

-			    top_pad="5"/>

-	    <!--line_editor

-			 border_style="line"

-			 border_thickness="1"

-			 follows="left|top|right"

-			 height="16"

-			 layout="topleft"

-			 left_pad="5"

-			 max_length="25"

-			 name="EditPrice"

-			 top_delta="0"

-			 width="242" /-->

-	    <!--text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="BaseMaskDebug"

-			 top="155"

-			 width="330">

-			B:

-	    </text>

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left_delta="60"

-			 name="OwnerMaskDebug"

-			 top_delta="0"

-			 width="270">

-			O:

-	    </text>

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left_delta="60"

-			 name="GroupMaskDebug"

-			 top_delta="0"

-			 width="210">

-			G:

-	    </text>

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left_delta="60"

-			 name="EveryoneMaskDebug"

-			 top_delta="0"

-			 width="150">

-			E:

-	    </text>

-	    <text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left_delta="60"

-			 name="NextMaskDebug"

-			 top_delta="0"

-			 width="90">

-			N:

-	    </text-->

-			    <!--text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="10"

-			 layout="topleft"

-			 left="10"

-			 name="SaleLabel"

-			 top_pad="5"

-			 width="330">

-			Mark Item:

-	    </text-->

-	    <!--radio_group

-			 draw_border="false"

-			 follows="left|top|right"

-			 height="16"

-			 layout="topleft"

-			 left_delta="78"

-			 name="RadioSaleType"

-			 top_delta="0"

-			 width="252">

-			    <radio_item

-			     height="16"

-			     label="Original"

-			     layout="topleft"

-			     left="0"

-			     name="radio"

-			     top="0"

-			     width="70" />

-			    <radio_item

-			     height="16"

-			     label="Copy"

-			     layout="topleft"

-			     left_delta="60"

-			     name="radio2"

-			     top_delta="0"

-			     width="70" />

-	    </radio_group-->

-	    <!--text

-			 type="string"

-			 length="1"

-			 follows="left|top"

-			 height="16"

-			 layout="topleft"

-			 left="10"

-			 name="TextPrice"

-			 top_pad="5"

-			 width="78">

-			Price: L$

-	    </text-->

-	</panel>

-    <panel

-		 height="25"

-		 layout="bottomright"

-		 help_topic="button_tab"

-		 name="button_panel"

-		 left="5"

-		 bottom="5"

-		 width="313">

-	    <button

-		     follows="bottom|left"

-		     font="SansSerifSmallBold"

-		     height="25"

-		     label="Edit"

-		     layout="topleft"

-		     left="0"

-		     name="edit_btn"

-		     top="0"

-		     width="50" />

-	    <button

-		     follows="bottom|right"

-		     font="SansSerifSmallBold"

-		     height="25"

-		     label="Cancel"

-		     layout="topleft"

-		     name="cancel_btn"

-		     right="-1"

-		     top="0"

-		     width="70" />

-	    <button

-		     follows="bottom|right"

-		     font="SansSerifSmallBold"

-		     height="25"

-		     label="Save"

-		     layout="topleft"

-		     name="save_btn"

-		     left_pad="-135"

-		     top="0"

-		     width="60" />

-	</panel>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	 auto_tile="true"
+	 height="570"
+	 layout="topleft"
+	 name="item properties"
+	 help_topic="item_properties"
+	 save_rect="true"
+	 title="Inventory Item Properties"
+	 width="333">
+	<panel.string
+		 name="unknown">
+        (unknown)
+	</panel.string>
+	<panel.string
+		 name="public">
+        (public)
+    </panel.string>
+	<panel.string
+    	 name="you_can">
+        You can:
+    </panel.string>
+	<panel.string
+    	 name="owner_can">
+        Owner can:
+    </panel.string>
+	<panel.string
+    	 name="acquiredDate">
+        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</panel.string>
+	<icon
+     	 follows="top|right"
+     	 height="18"
+     	 image_name="Lock"
+	     layout="topleft"
+		 right="-50"
+	     mouse_opaque="true"
+	     name="IconLocked"
+	     top="4"
+	     width="18" />
+    <button
+	     follows="top|right"
+	     height="25"
+	     image_overlay="BackArrow_Off"
+	     layout="topleft"
+	     name="back_btn"
+	     picture_style="true"
+	     right="-5"
+	     tab_stop="false"
+	     top="0"
+	     width="25" />
+	<panel
+         follows="all"
+         height="500"
+         label=""
+         layout="topleft"
+         left="5"
+         help_topic=""
+         top="30"
+		 border="1"
+         width="313">
+	    <text	 	 	 
+		     type="string"
+		     length="1"
+		     follows="left|top"
+		     height="10"
+		     layout="topleft"
+		     left="5"
+		     name="LabelItemNameTitle"
+		     top="5"
+		     width="78">
+	        Name:
+	    </text>
+    	<line_editor
+		     border_style="line"
+		     border_thickness="1"
+	    	 follows="left|top|right"
+		     height="16"
+		     layout="topleft"
+	    	 left_delta="78"
+		     max_length="63"
+		     name="LabelItemName"
+	    	 top_delta="0"
+		     width="225" />
+	    <text
+		     type="string"
+		     length="1"
+	    	 follows="left|top"
+	    	 height="10"
+		     layout="topleft"
+    		 left="5"
+		     name="LabelItemDescTitle"
+    		 top_delta="20"
+	    	 width="78">
+	        Description:
+	    </text>
+	    <line_editor
+		     border_style="line"
+    		 border_thickness="1"
+	    	 follows="left|top|right"
+	    	 height="16"
+		     layout="topleft"
+    		 left_delta="78"
+		     max_length="127"
+    		 name="LabelItemDesc"
+	    	 top_delta="0"
+	    	 width="225" />
+	    <text
+		     type="string"
+		     length="1"
+		     follows="left|top"
+		     height="16"
+		     layout="topleft"
+		     left="10"
+		     name="LabelCreatorTitle"
+		     top="65"
+		     width="78">
+	        Creator:
+    	</text>
+	    <text
+		     type="string"
+		     length="1"
+		     follows="left|top"
+		     height="16"
+		     layout="topleft"
+		     left_delta="78"
+		     name="LabelCreatorName"
+		     top_delta="0"
+		     width="200">
+	        Nicole Linden
+	     </text>
+	     <button
+			 follows="top|right"
+			 font="SansSerifSmall"
+			 height="16"
+			 label="Profile..."
+			 layout="topleft"
+			 left_delta="144"
+			 name="BtnCreator"
+			 top_delta="0"
+			 width="78" />
+	     <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="16"
+			 layout="topleft"
+			 left="10"
+			 name="LabelOwnerTitle"
+			 top="85"
+			 width="78">
+			    Owner:
+	     </text>
+	     <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="16"
+			 layout="topleft"
+			 left_delta="78"
+			 name="LabelOwnerName"
+			 top_delta="0"
+			 width="200">
+			    Thrax Linden
+	     </text>
+	     <button
+			 follows="top|right"
+			 font="SansSerifSmall"
+			 height="16"
+			 label="Profile..."
+			 layout="topleft"
+			 left_delta="144"
+			 name="BtnOwner"
+			 top_delta="0"
+			 width="78" />
+	     <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="16"
+			 layout="topleft"
+			 left="10"
+			 name="LabelAcquiredTitle"
+			 top="105"
+			 width="78">
+			Acquired:
+	     </text>
+	     <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="16"
+			 layout="topleft"
+			 left_delta="78"
+			 name="LabelAcquiredDate"
+			 top_delta="0"
+			 width="252">
+			Wed May 24 12:50:46 2006
+	    </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="OwnerLabel"
+			 top="125"
+			 width="78">
+			You:
+	    </text>
+	    <check_box
+			 height="16"
+			 label="Edit"
+			 layout="topleft"
+			 left_pad="5"
+			 name="CheckOwnerModify"
+			 top_delta="0"
+			 width="78" />
+	    <check_box
+			 height="16"
+			 label="Copy"
+			 layout="topleft"
+			 left_delta="0"
+			 name="CheckOwnerCopy"
+			 top_pad="5"
+			 width="88" />
+	    <check_box
+			 height="16"
+			 label="Resell"
+			 layout="topleft"
+			 left_delta="0"
+			 name="CheckOwnerTransfer"
+			 top_pad="5"
+			 width="106" />
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="AnyoneLabel"
+			 top_pad="5"
+			 width="78">
+			Anyone:
+	    </text>
+	    <check_box
+			 height="16"
+			 label="Copy"
+			 layout="topleft"
+			 left_pad="5"
+			 name="CheckEveryoneCopy"
+			 top_delta="0"
+			 width="130" />
+    	<text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="GroupLabel"
+			 top_pad="5"
+			 width="78">
+			Group:
+    	</text>
+	    <check_box
+			 height="16"
+			 label="Share"
+			 layout="topleft"
+			 left_pad="5"
+			 name="CheckShareWithGroup"
+			 top_delta="5"
+			 width="106" />
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="NextOwnerLabel"
+			 top_pad="5"
+			 width="78">
+			Next owner:
+	    </text>
+	    <check_box
+			 height="16"
+			 label="Edit"
+			 layout="topleft"
+			 left_pad="5"
+			 name="CheckNextOwnerModify"
+			 top_delta="0"
+			 width="78" />
+	    <check_box
+			 height="16"
+			 label="Copy"
+			 layout="topleft"
+			 left_delta="0"
+			 name="CheckNextOwnerCopy"
+			 top_pad="5"
+			 width="88" />
+	    <check_box
+			 height="16"
+			 label="Resell"
+			 layout="topleft"
+			 left_delta="0"
+			 name="CheckNextOwnerTransfer"
+			 top_pad="5"
+			 width="106" />
+	    <check_box
+			 height="16"
+			 label="For Sale"
+			 layout="topleft"
+			 left="10"
+			 name="CheckPurchase"
+			 top_pad="5"
+			 width="78" />
+		<combo_box
+			 height="19"
+			 left_pad="5"
+			 layout="topleft"
+			 follows="left|top"
+			 name="combobox sale copy"
+			 width="90">
+			<combo_box.item
+			     label="Copy"
+			     name="Copy"
+			     value="Copy" />
+			<combo_box.item
+			     label="Original"
+			     name="Original"
+			     value="Original" />
+	    </combo_box>
+	    <spinner
+			    follows="left|top"
+			    decimal_digits="0"
+			    increment="1"
+			    control_name="Edit Cost"
+			    name="Edit Cost"
+			    label="Price: L$"
+			    label_width="60"
+			    left="10"
+			    width="180"
+			    min_val="1"
+			    height="19"
+			    max_val="999999999"
+			    top_pad="5"/>
+	    <!--line_editor
+			 border_style="line"
+			 border_thickness="1"
+			 follows="left|top|right"
+			 height="16"
+			 layout="topleft"
+			 left_pad="5"
+			 max_length="25"
+			 name="EditPrice"
+			 top_delta="0"
+			 width="242" /-->
+	    <!--text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="BaseMaskDebug"
+			 top="155"
+			 width="330">
+			B:
+	    </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left_delta="60"
+			 name="OwnerMaskDebug"
+			 top_delta="0"
+			 width="270">
+			O:
+	    </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left_delta="60"
+			 name="GroupMaskDebug"
+			 top_delta="0"
+			 width="210">
+			G:
+	    </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left_delta="60"
+			 name="EveryoneMaskDebug"
+			 top_delta="0"
+			 width="150">
+			E:
+	    </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left_delta="60"
+			 name="NextMaskDebug"
+			 top_delta="0"
+			 width="90">
+			N:
+	    </text-->
+			    <!--text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="10"
+			 layout="topleft"
+			 left="10"
+			 name="SaleLabel"
+			 top_pad="5"
+			 width="330">
+			Mark Item:
+	    </text-->
+	    <!--radio_group
+			 draw_border="false"
+			 follows="left|top|right"
+			 height="16"
+			 layout="topleft"
+			 left_delta="78"
+			 name="RadioSaleType"
+			 top_delta="0"
+			 width="252">
+			    <radio_item
+			     height="16"
+			     label="Original"
+			     layout="topleft"
+			     left="0"
+			     name="radio"
+			     top="0"
+			     width="70" />
+			    <radio_item
+			     height="16"
+			     label="Copy"
+			     layout="topleft"
+			     left_delta="60"
+			     name="radio2"
+			     top_delta="0"
+			     width="70" />
+	    </radio_group-->
+	    <!--text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="16"
+			 layout="topleft"
+			 left="10"
+			 name="TextPrice"
+			 top_pad="5"
+			 width="78">
+			Price: L$
+	    </text-->
+	</panel>
+    <panel
+		 height="25"
+		 layout="bottomright"
+		 help_topic="button_tab"
+		 name="button_panel"
+		 left="5"
+		 bottom="5"
+		 width="313">
+	    <button
+		     follows="bottom|left"
+		     font="SansSerifSmall"
+		     height="25"
+		     label="Edit"
+		     layout="topleft"
+		     left="0"
+		     name="edit_btn"
+		     top="0"
+		     width="50" />
+	    <button
+		     follows="bottom|right"
+		     font="SansSerifSmall"
+		     height="25"
+		     label="Cancel"
+		     layout="topleft"
+		     name="cancel_btn"
+		     right="-1"
+		     top="0"
+		     width="70" />
+	    <button
+		     follows="bottom|right"
+		     font="SansSerifSmall"
+		     height="25"
+		     label="Save"
+		     layout="topleft"
+		     name="save_btn"
+		     left_pad="-135"
+		     top="0"
+		     width="60" />
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 8eb2254112..7647be7830 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -485,7 +485,7 @@
 		 width="313">
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Edit"
 		     layout="topleft"
@@ -495,7 +495,7 @@
 		     width="50" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Open"
 		     layout="topleft"
@@ -505,7 +505,7 @@
 		     width="60" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Pay"
 		     layout="topleft"
@@ -515,7 +515,7 @@
 		     width="50" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Buy"
 		     layout="topleft"
@@ -525,7 +525,7 @@
 		     width="60" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Cancel"
 		     layout="topleft"
@@ -535,7 +535,7 @@
 		     width="70" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Save"
 		     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ea66bfa197..e76763d7eb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1747,10 +1747,10 @@ Clears (deletes) the media and all params from the given face.
   </string>
 
   <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Set Not Away</string>
-	<string name="AvatarSetAway">Set Away</string>
-	<string name="AvatarSetNotBusy">Set Not Busy</string>
-	<string name="AvatarSetBusy">Set Busy</string>
+	<string name="AvatarSetNotAway">Not Away</string>
+	<string name="AvatarSetAway">Away</string>
+	<string name="AvatarSetNotBusy">Not Busy</string>
+	<string name="AvatarSetBusy">Busy</string>
 	
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
@@ -2863,11 +2863,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Connecting...
   </string>
   <string name="conference-title">
-    Friends Conference
+    Ad-hoc Conference
   </string>
   <string name="inventory_item_offered-im">
     Inventory item offered
   </string>
+  <string name="share_alert">
+    Drag items from inventory here
+  </string>
 
   <string name="only_user_message">
     You are the only user in this session.
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 5bb48ef5aa..6b11e72247 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+  image_pressed
+	image_pressed_selected
+   -->
 <button image_unselected="PushButton_Off"
         image_selected="PushButton_Selected"
         image_disabled_selected="PushButton_Selected_Disabled"
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index fa3cb9275e..132bd24bca 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -16,7 +16,9 @@
                               scale_image="true"
                               pad_right="24"
                               image_unselected="DropDown_Off"
-                              image_selected="DropDown_Selected"
+                              image_selected="DropDown_On"
+                              image_pressed="DropDown_Press" 
+                              image_pressed_selected="DropDown_Press"
                               image_disabled="DropDown_Disabled" />
   <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
                         background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 61950d7554..8ec206023e 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- See also settings.xml UIFloater* settings for configuration -->
 <inspector name="inspector"
-          bg_opaque_color="ToolTipBgColor"
+          bg_opaque_color="DkGray_66"
           background_visible="true"
           bg_opaque_image="none"
+          background_opaque="true"
           bg_alpha_image="none"
+		  text_color="InspectorTipTextColor"
  />
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
index 0794b49a0c..f936a1e208 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_column_header image_unselected="square_btn_32x128.tga"
-                      image_selected="square_btn_selected_32x128.tga"
-                      image_disabled="square_btn_32x128.tga"
-                      image_disabled_selected="square_btn_selected_32x128.tga"
-                      image_overlay="combobox_arrow.tga"
+<scroll_column_header
+		    image_unselected="SegmentedBtn_Middle_Selected"
+                      image_selected="SegmentedBtn_Middle_Selected"
+		      image_pressed="SegmentedBtn_Middle_Selected_Press"
+                      image_disabled="SegmentedBtn_Middle_Disabled"
+                      image_disabled_selected="SegmentedBtn_Middle_Selected_Disabled"
+                      image_overlay="DisclosureArrow_Opened_Off"
                       image_overlay_alignment="right"
                       halign="left"
-                      scale_image="true"/>
+                      scale_image="true" />
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index bc1ca339a2..706c89f5ed 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -4,6 +4,8 @@
             thumb_center_color="SliderThumbCenterColor"
             thumb_image="SliderThumb_Off"
             thumb_image_pressed="SliderThumb_Press"
-            thumb_image_disabled="SliderThumb_Disabled" 
-            track_image="SliderTrack_Horiz"
-            track_highlight_image="SliderTrack_Horiz" />
+            thumb_image_disabled="SliderThumb_Disabled"
+            track_image_horizontal="SliderTrack_Horiz"
+            track_image_vertical="SliderTrack_Vert"
+            track_highlight_horizontal_image="SliderTrack_Horiz"
+            track_highlight_vertical_image="SliderTrack_Vert" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index 6b49f832fd..a19201f7c3 100644
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
@@ -5,6 +5,8 @@
           padding="4"
           wrap="true"
           font="SansSerif"
-          bg_opaque_color="ToolTipBgColor"
+          bg_opaque_image="Tooltip"
+          background_opaque="true"
           background_visible="true"
+		  text_color="ToolTipTextColor"
  />