Merge remote branch 'mccabe/1.2.0-next' into next

Moved "Backup" pie menu item to fit "Go Here" in top-left slot.

Conflicts:
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml

10 files changed, 261 insertions, 106 deletions

diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f..97174b0 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -2,7 +2,7 @@
 <table width="100%" height="100%" border="0">
         <tr>
                 <td align="center" valign="middle" style="font-size:0.8em;">
-                        <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
+                        <img src="imprudence_loading.png" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
                 </td>
         </tr>
 </table>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
new file mode 100644
index 0000000..be7de86
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+        name="animation list"
+        title="Animation List"
+        can_resize="true"
+        can_minimize="true"
+        can_close="true"
+        can_drag_on_left="false"
+    rect_control="FloaterAnimationListRect"
+        min_width="1000"
+        min_height="275"
+        >
+        <scroll_list
+                    name="animation_list"
+                    left="10"
+                    right="-10"
+                    top="-20"
+                    bottom="100"
+                    column_padding="0"
+                    can_resize="true"
+                    follows="left|top|bottom|right"
+                    draw_heading="true"
+                    multi_select="true"
+                    search_column="1"
+                    tool_tip="Hold shift or control while clicking to select multiple thingers"
+                    >
+                <!-- Icons relating to the avatar, currently: tracking, and marked -->
+                <column name="Anim Name" label="Anim Name" width="250"/>
+    <column name="Animation UUID" label="Animation UUID" width="250"/>
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+                <column name="Source Object UUID" label="Source Object UUID" width="250"/>
+    <column name="Source Owner" label="Source Owner" width="250"/>
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+        </scroll_list>
+        <panel 
+               name="options"
+               left="10"
+               right="-10"
+         top="90"       
+               bottom="10"      
+               border="true"
+               mouse_opaque="true"
+               bevel_style="in"
+               background_visible="true"
+               background_opaque="true"
+               follows="left|right|bottom"
+               bg_opaque_color="0,0,0,0.3"
+               bg_alpha_color="blue"
+               can_resize="false"
+        >
+        </panel>
+
+  <button bottom="55" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop Selected" left_delta="5"
+       mouse_opaque="true" name="Stop Selected"
+       tool_tip="Stop selected animations" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Revoke Selected"
+       tool_tip="Revokes animation permissions for object associated with the selections" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop+Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Stop+Revoke Selected"
+       tool_tip="Revokes animation permissions for object(s) associated with the selections, as well as stopping the anim" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Open Owner Profile" left_delta="155"
+       mouse_opaque="true" name="Open Owner Profile"
+       tool_tip="Opens profile of the owner(s) of object(s) associated with the selections" width="150" />
+  <button bottom_delta="-25" enabled="false" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Return Object" left_delta="-465"
+       mouse_opaque="true" name="Return Object"
+       tool_tip="Returns object(s) selected, if you have land powers" width="150" />
+
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
new file mode 100644
index 0000000..13c6b6c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|bottom" height="620"
+     hidden="false" left="300" min_height="420" min_width="630"
+     mouse_opaque="true" name="asset browser" title="Asset Browser" width="720">
+        
+        <inventory_panel allow_multi_select="false" border="true" bottom="-299" enabled="true"
+             follows="left|top" height="280" hidden="false" left="10"
+             mouse_opaque="true" name="inventory panel"
+             sort_order="TexturePickerSortOrder" width="231"/>
+
+        <button bottom="-350" follows="left|top" font="SansSerifSmall"
+                halign="center" height="20" hidden="false" label="Next &gt;&gt;"
+                left="160" mouse_opaque="true" name="button next" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="&lt;&lt; Previous"
+                left_delta="0" mouse_opaque="true" name="button previous" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="Refresh"
+                left_delta="0" mouse_opaque="true" name="button refresh" scale_image="TRUE"
+                width="80"/>
+                
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index d32832c..dd66a83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
      min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
      rect_control="FloaterChatRect" title="Local Chat" width="435">
@@ -59,10 +59,14 @@
                         <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                              tab_group="1" top="25">
         <string name="gesture_label">Gestures</string>
+        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
+             increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
+             max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+             width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 18d56b4..bc18f44 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
+<floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="565" 
      left="308" min_height="100" min_width="100" mouse_opaque="true"
      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
      short_title="Build" width="272">
@@ -79,20 +79,24 @@
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
              name="radio select face" radio_style="true" width="114" />
-  <check_box bottom_delta="-22" control_name="SnapEnabled" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Options..." label_selected="Options..." left_delta="75"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Edit linked parts" left="4" mouse_opaque="true"
+             name="checkbox edit linked parts" width="114" />
+  <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Link" label_selected="Link"
+          left="10" mouse_opaque="true" name="link_btn" width="68" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Unlink" label_selected="Unlink"
+          left_delta="75" mouse_opaque="true" name="unlink_btn" width="68" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
              mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-    Ruler mode:
+    Ruler:
   </text>
-  <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-             left_delta="74" max_chars="20" mouse_opaque="true"
+        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+             left_delta="40" max_chars="20" mouse_opaque="true"
              name="combobox grid mode" width="86">
     <combo_item name="World" value="World">
       World
@@ -112,16 +116,13 @@
              font="SansSerifSmall" height="16" initial_value="true"
              label="Stretch Textures" left_delta="0" mouse_opaque="true"
              name="checkbox stretch textures" width="134" />
-  <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Edit linked parts" left="143" mouse_opaque="true"
-             name="checkbox edit linked parts" width="114" />
-  <button bottom_delta="-18" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Link" label_selected="Link"
-          right="-5" mouse_opaque="true" name="link_btn" width="78" />
-  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Unlink" label_selected="Unlink"
-          right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
+  <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+        <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+       halign="center" valign="center"
+             height="20" label="Options..." label_selected="Options..." left_delta="20"
+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 
 <!-- Help text -->
 
@@ -289,18 +290,18 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
              border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
-             hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
-                  Brush:
+             hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
+                  Bulldozer:
         </text>
 
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
              border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-             hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+             hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
                   Size
         </text>
         <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-             increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
              mouse_opaque="true" name="slider brush size" width="80" /> 
 
 
@@ -312,21 +313,23 @@
         </text>
         <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
              increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
-             mouse_opaque="true" name="slider force" width="80" />      
-
-
-        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-             name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
+             mouse_opaque="true" name="slider force" width="80" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="right" height="16"
+         mouse_opaque="true" name="obj_count" v_pad="0" width="143">
+    Selected objects: [COUNT]
+  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-181" left="118" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="right" height="16"
+       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
+    primitives: [COUNT]
+  </text>
 
 <!-- Sub-tabs -->
 
-        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+        <tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
              name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
              tab_position="top" width="272">
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -364,7 +367,7 @@
                                 Thrax Linden
                         </text>
                         <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
                              mouse_opaque="true" name="button creator profile" scale_image="TRUE"
                              width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -380,32 +383,42 @@
                                 Thrax Linden
                         </text>
                         <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
                              mouse_opaque="true" name="button owner profile" scale_image="TRUE"
                              width="78" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+        Last Owner:
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+                             mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+        Thrax Linden
+      </text>
+      <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
+                             mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
+                             width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                              mouse_opaque="true" name="Group:" v_pad="0" width="78">
                                 Group:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
                              mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
                              width="88">
                                 The Lindens
                         </text>
-                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." left_delta="94"
+                        <button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="20" label="Set..." label_selected="Set..." left_delta="94"
                              mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-126" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="prim info" v_pad="0" width="166">
-                                1 Object, 1 Primitive
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                              mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
@@ -420,7 +433,7 @@
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Share with group" left="10"
                              mouse_opaque="true" name="checkbox share with group"
-                             tool_tip="Allow group members to move, modify, copy and delete."
+                             tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
                              width="166" />
                         <string name="text deed continued">
                                 Deed...
@@ -428,8 +441,8 @@
                         <string name="text deed">
                                 Deed
                         </string>
-                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+                        <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="20" label="Deed..." label_selected="Deed..." left_delta="172"
                              mouse_opaque="true" name="button deed" scale_image="TRUE"
                              tool_tip="Group shared objects can be deeded by a group officer."
                              width="78" />
@@ -517,37 +530,37 @@
                                 </combo_item>
                         </combo_box>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="B:" v_pad="0" width="174">
                                 B:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="O:" v_pad="0" width="124">
                                 O;
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="G:" v_pad="0" width="74">
                                 G:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="E:" v_pad="0" width="174">
                                 E:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="N:" v_pad="0" width="124">
                                 N:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="F:" v_pad="0" width="74">
                                 F:
@@ -764,12 +777,12 @@
                                 Skew
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
-                             mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+                             mouse_opaque="true" name="Scale 1" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
                              mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -888,10 +901,10 @@
                         </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
                              increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             mouse_opaque="true" name="Radius Offset" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
                              increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
+                             mouse_opaque="true" name="Revolutions" width="68" />
                         <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                              default_image_name="Default" follows="left|top" height="141"
                              label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1192,7 +1205,7 @@
                              initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
                              name="rptctrl" width="68" />
                         <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Apply" label_selected="Apply" left_delta="78"
+                             height="20" label="Apply" label_selected="Apply" left_delta="78"
                              mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-288" drop_shadow_visible="true" follows="left|top"
@@ -1223,10 +1236,13 @@
                 </panel>
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                              label="New Script..." label_selected="New Script..."
+      <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
+                              label="New Script" label_selected="New Script..."
                              left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                             width="130" />
+                             width="100" />
+      <!--<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
+            mouse_opaque="true" scale_image="TRUE" />-->
                         <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
                              mouse_opaque="true" name="ContentsInventory" width="252" />
                 </panel>
@@ -1236,22 +1252,10 @@
 
         <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
              name="land info panel" width="272">
+        <!-- Parcel Information -->
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom="-40" drop_shadow_visible="true" follows="left|top"
                      font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-                     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
-                        Modify Parcel
-                </text>
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="112" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="48"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
                      mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
                         Parcel Information
                 </text>
@@ -1271,12 +1275,27 @@
                      height="20" label="About Land..." label_selected="About Land..." left="48"
                      mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
                 <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
-                     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
-                     height="16" initial_value="false" label="Show Status" left="48" 
+                     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
+                     height="16" initial_value="false" label="Show owners" left="48" 
                      mouse_opaque="true" name="checkbox show owners" width="100" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="94"
                              mouse_opaque="true" name="button show owners help" width="18" />
+        <!-- Modify Parcel -->
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+                        Modify Parcel
+                </text>
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+                     width="112" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Join..." label_selected="Join..." left="48"
+                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+        <!-- Land Transactions -->
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
                      font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
@@ -1307,10 +1326,10 @@
                 Click and drag to change view
         </string>
         <string name="status_grab">
-                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+                Drag to move, Ctrl to lift, Ctrl-Shift to rotate
         </string>
         <string name="status_place">
-                Click in the world to create, shift-click to select
+                Click inworld to build
         </string>
         <string name="status_selectland">
                 Click and drag to select land
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index ac3d359..15cdc9e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -44,7 +44,11 @@
                         <on_enable function="Object.EnableReturn" />
                 </menu_item_call>
                 <pie_menu label="More &gt;" name="Rate Menu">
-      <menu_item_separator />
+      <menu_item_call label="Backup" enabled="false" hidden="false"
+                      mouse_opaqu="true" name="Export">
+        <on_click function="Object.Export" />
+        <on_enable function="Object.EnableExport" />
+      </menu_item_call>
       <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
         <on_click function="Object.Mute" />
         <on_enable function="Object.EnableMute" />
@@ -54,10 +58,8 @@
         <on_click function="Object.ReportAbuse" />
         <on_enable function="Object.EnableReportAbuse" />
       </menu_item_call>
-      <menu_item_call label="Backup" enabled="false" hidden="false"
-                      mouse_opaqu="true" name="Export">
-        <on_click function="Object.Export" />
-        <on_enable function="Object.EnableExport" />
+      <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
+        <on_click function="GoToObject" />
       </menu_item_call>
       <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
         <on_click function="Object.Inspect" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 3681b62..81c49e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -892,6 +892,25 @@
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
+    <menu_item_call label="Ground Sit" name="Ground Sit" 
+                    shortcut="control|alt|s">
+      <on_click function="Advanced.ToggleSit" userdata="" />
+      <on_Check function="Advanced.CheckSit" userdata="" />
+    </menu_item_call>
+    <menu_item_check label="Phantom Avatar" name="Phantom" 
+                     shortcut="control|alt|p">
+      <on_click function="Advanced.TogglePhantom" userdata="" />
+      <on_check function="Advanced.CheckPhantom" userdata="" />
+    </menu_item_check>
+    <menu_item_check label="Animation List" name="Animation List">
+      <on_click function="ShowFloater" userdata="animation list" />
+      <on_check function="FloaterVisible" userdata="animation list" />
+    </menu_item_check>
+    <menu_item_check label="Asset Browser" name="asset browser" 
+                     shortcut="alt|shift|a">
+      <on_click function="Advanced.ToggleAssetBrowser" userdata="" />
+      <on_check function="Advanced.CheckAssetBrowser" userdata="" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 464ecac..ac3a74a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -8,13 +8,17 @@
         <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
              label="Local Chat" left="7" name="History"
              tool_tip="Click here to see what has been said" width="93" />
+  <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 
+                         increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
+                         max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+                         width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
              follows="left|right|bottom" font="SansSerif"
              handle_edit_keys_directly="false" height="20" label="Click here to chat."
-             left="107" max_length="254" name="Chat Editor"
+             left="212" max_length="254" name="Chat Editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
+             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="5" />
+        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="4"
              list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
              width="80">
                 <flyout_button_item value="shout" name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 24753d1..b0384cf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -131,30 +131,34 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Close chat bar after hitting return" left="148" mouse_opaque="true"
              name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Arrow keys always move avatar when chatting" left="148"
              mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
              width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false" 
+       label="Show custom chat channel" left="148" mouse_opaque="true"
+             name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box7" v_pad="0" width="128">
                 Bubble Chat:
         </text>
-        <check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
+        <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show chat bubbles" left="148" mouse_opaque="true"
              name="bubble_text_chat" radio_style="false" width="237" />
-        <slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
+        <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
              decimal_digits="3" enabled="true" follows="left|top" height="12"
              increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"