Second Life viewer sources 1.23.2-RC

14 files changed, 107 insertions, 117 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 3472b5b..4806695 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -27,14 +27,14 @@
   SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-google-perftools Copyright (c) 2005, Google Inc.
+  google-perftools Copyright (c) 2005, Google Inc.
 
   All rights reserved.  See licenses.txt for details.
 
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  I get by with a little help from my friends. --Richard Starkey</text_editor>
+  To be a success in business, be daring, be first, be different. --Henry Marchant</text_editor>
 
         <text_editor bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index 44b010a..b97b1e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -16,7 +16,7 @@
                         <icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
                              mouse_opaque="true" name="icon" width="16" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                         <button bottom="-81" follows="left|top" font="SansSerifSmall" halign="center"
                              height="16" label="Body" label_selected="Body" left="8" mouse_opaque="true"
@@ -108,13 +108,13 @@ scratch and wear it.
       </text>
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Shape" label_selected="Create New Shape" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
                      label="Skin" left="102" mouse_opaque="true" name="Skin" width="389">
@@ -199,15 +199,15 @@ scratch and wear it.
                              tool_tip="Click to choose a picture" width="74" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Skin" label_selected="Create New Skin" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -285,15 +285,15 @@ scratch and wear it.
                              tool_tip="Click to choose a picture" width="64" />
                         <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Hair" label_selected="Create New Hair" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -359,15 +359,15 @@ scratch and wear it.
                              tool_tip="Click to choose a picture" width="64" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Eyes" label_selected="Create New Eyes" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel label="Clothes" placeholder="true" name="clothes_placeholder" />
@@ -388,7 +388,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Shirt" label_selected="Create New Shirt" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -396,10 +396,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top|right"
@@ -469,7 +469,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Pants" label_selected="Create New Pants" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -477,10 +477,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top|right"
@@ -600,7 +600,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
                         <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Shoes" label_selected="Create New Shoes" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -608,10 +608,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -681,7 +681,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Socks" label_selected="Create New Socks" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -689,10 +689,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -755,18 +755,18 @@ scratch and wear it.
       <texture_picker allow_no_texture="false" bottom="-145" can_apply_immediately="true"
                              default_image_name="Default" follows="left|top" height="80"
                              label="Upper Fabric" left="8" mouse_opaque="true" name="Upper Fabric"
-                             tool_tip="Click to choose a picture" width="64" />
+                             tool_tip="Click to choose a picture" width="66" />
       <texture_picker allow_no_texture="false" bottom="-225" can_apply_immediately="true"
                              default_image_name="Default" follows="left|top" height="80"
                              label="Lower Fabric" left="8" mouse_opaque="true" name="Lower Fabric"
-                             tool_tip="Click to choose a picture" width="64" />
+                             tool_tip="Click to choose a picture" width="66" />
       <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-305"
                              can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
                              label="Color/Tint" left="8" mouse_opaque="true" name="Color/Tint"
-                             tool_tip="Click to open Color Picker" width="64" />
+                             tool_tip="Click to open Color Picker" width="66" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Jacket" label_selected="Create New Jacket" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="140" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-330" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -774,10 +774,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -847,7 +847,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Gloves" label_selected="Create New Gloves" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="130" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -855,10 +855,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -930,7 +930,7 @@ scratch and wear it.
       <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Undershirt" label_selected="Create New Undershirt"
                              left="8" mouse_opaque="true" name="Create New" scale_image="true"
-                             width="160" />
+                             width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -938,10 +938,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -1013,7 +1013,7 @@ scratch and wear it.
                         <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Underpants" label_selected="Create New Underpants"
                              left="8" mouse_opaque="true" name="Create New" scale_image="true"
-                             width="160" />
+                             width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -1021,10 +1021,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
@@ -1094,7 +1094,7 @@ scratch and wear it.
                              tool_tip="Click to open Color Picker" width="64" />
                         <button bottom="-128" follows="left|top" halign="center" height="24"
                              label="Create New Skirt" label_selected="Create New Skirt" left="8"
-                             mouse_opaque="true" name="Create New" scale_image="true" width="120" />
+                             mouse_opaque="true" name="Create New" scale_image="true" width="170" />
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="Take Off" label_selected="Take Off" left="8"
                              mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
@@ -1102,10 +1102,10 @@ scratch and wear it.
                              height="20" label="Save" label_selected="Save" left="123"
                              mouse_opaque="true" name="Save" scale_image="true" width="82" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Save As..." label_selected="Save As..." left="211"
-                             mouse_opaque="true" name="Save As" scale_image="true" width="82" />
+                             height="20" label="Save As..." label_selected="Save As..." left="209"
+                             mouse_opaque="true" name="Save As" scale_image="true" width="92" />
                         <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Revert" label_selected="Revert" left="299"
+                             height="20" label="Revert" label_selected="Revert" left="305"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                 </panel>
         </tab_container>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index cb8ef51..df9657c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -340,7 +340,7 @@
     </panel>
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-                     width="778">
+                     width="778" default_tab_group="1">
                         <string name="searching_text">
                                 Searching...
                         </string>
@@ -360,17 +360,17 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" width="156" />
+                             name="incpg" tab_group="7" width="156" />
                         <check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" width="156" />
+                             name="incmature" tab_group="8" width="156" />
                         <check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
                              font="SansSerifSmall" height="16" initial_value="false"
                              label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" width="156" />
+                             name="incadult" tab_group="9" width="156" />
                         <combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
-                             max_chars="20" mouse_opaque="true" name="type" width="128">
+                             max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
                                 <combo_item name="AllTypes" value="All Types">
                                         All Types
                                 </combo_item>
@@ -387,7 +387,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-                             width="88" />
+                             tab_group="1" width="88" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
                              bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
                              name="pricecheck_symbol" width="15">
@@ -396,7 +396,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-                             width="80" />
+                             tab_group="3" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
                              bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
                              name="areacheck_symbol" width="15">
@@ -404,16 +404,16 @@ To buy direct, visit the land and click on the place name in the title bar.
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
                              follows="left|top" font="SansSerifSmall" height="16" left="132"
-                             max_length="10" mouse_opaque="true" name="priceedit" width="50" />
+                             max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
                              follows="left|top" font="SansSerifSmall" height="16" left="117"
-                             max_length="10" mouse_opaque="true" name="areaedit" width="50" />
+                             max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
                         <button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left="208" mouse_opaque="true"
-                             name="Search" width="70" />
+                             name="Search" tab_group="5" width="70" />
                         <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" width="387">
+                             multi_select="false" name="results" search_column="2" tab_group="10" width="387">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
                                 <column dynamicwidth="true" label="Name" name="name" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index a5d25a4..bb2c3e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -5,23 +5,23 @@
         <texture_picker bottom_delta="-175" enabled="false" follows="top|left" height="135" left="244"
              name="info_image" right="424" width="180" />
         <text bottom_delta="144" follows="top|left" font="SansSerifSmall" left="16"
-             name="info_parcel_label"  width="48">
+             name="info_parcel_label"  width="64">
                 Parcel:
         </text>
-        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="56"
+        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="72"
              name="info_parcel" right="-20" >
                 PARCEL NAME
         </text>
         <text follows="top|left" font="SansSerifSmall" left="16" name="info_size_label"
-              width="48">
+              width="64">
                 Size:
         </text>
-        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="56"
+        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="72"
              name="info_size" right="-20" >
-                [AREA] sq. m.
+                [AREA] sq.m.
         </text>
         <text bottom_delta="-94" follows="top|left" font="SansSerifHuge" height="24"
-             left="16" name="info_action" text_color="white" width="200">
+             left="16" name="info_action" text_color="white" width="210">
                 To sell this parcel:
         </text>
         <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
@@ -65,7 +65,7 @@
         <line_editor bottom_delta="-20" enabled="false" follows="top|right" height="16"
              name="sell_to_agent"  width="150" />
         <button bottom_delta="0" height="16" label="Select..." left_delta="155"
-             name="sell_to_select_agent" width="60" />
+             name="sell_to_select_agent" width="110" />
         <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_sell_objects" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72"
@@ -93,7 +93,7 @@
                 REMEMBER: All sales are final.
         </text>
         <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
-             left="72" name="sell_btn" width="130" />
+             left="72" name="sell_btn" width="160" />
         <button bottom_delta="0" follows="bottom|right" height="20" label="Cancel"
              name="cancel_btn" right="444" width="90" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
index bfdc449..de72f7e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="190" min_height="140" min_width="300"
-     name="Name/Description" title="sound.wav" width="300">
+     name="Sound Preview" title="sound.wav" width="300">
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-35" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
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 78fbcd2..6dcc255 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
@@ -397,7 +397,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...
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index aa61e77..952bf7c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -223,10 +223,13 @@
              mouse_opaque="true" name="Detach From Yourself" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
         </menu_item_call>
+        <!-- COMMENTED OUT for DEV-32347 -->
+        <!--
         <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
              name="Restore to Last Position" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
         </menu_item_call>
+        -->
         <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
              name="Object Wear" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index acbe4f4..2c97e63 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -3,39 +3,31 @@
         <menu_item_call enabled="true" label="Profile..." name="Profile...">
                 <on_click function="ShowAgentProfile" userdata="agent" />
         </menu_item_call>
-        <menu_item_call enabled="true" label="Groups..." name="Groups...">
-                <on_click function="ShowAgentGroups" userdata="agent" />
+        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+                <on_click function="Attachment.Drop" />
+                <on_enable function="Attachment.EnableDrop" />
         </menu_item_call>
-        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
-                        <on_click function="Object.Touch" />
-                        <on_enable function="Object.EnableTouch" userdata="Touch" />
+        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Attachment Object Touch">
+                <on_click function="Object.Touch" />
+                <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
                 </menu_item_call>
         <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
                 <on_click function="Self.StandUp" userdata="" />
                 <on_enable function="Self.EnableStandUp" />
         </menu_item_call>
-        <menu_item_call enabled="true" label="Friends..." name="Friends...">
-                <on_click function="ShowFloater" userdata="friends" />
+        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+                <on_click function="Attachment.Detach" />
+                <on_enable function="Attachment.EnableDetach" />
         </menu_item_call>
         <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
                 <on_click function="ShowFloater" userdata="gestures" />
         </menu_item_call>
-        <pie_menu label="More &gt;" name="More &gt;">
-                <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
-                        <on_click function="Attachment.Detach" />
-                        <on_enable function="Attachment.EnableDetach" />
-                </menu_item_call>
-                <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
-                        <on_click function="Attachment.Drop" />
-                        <on_enable function="Attachment.EnableDrop" />
-                </menu_item_call>
-                <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
-                        <on_click function="Object.Edit" />
-                        <on_enable function="EnableEdit" />
-                </menu_item_call>
-        </pie_menu>
         <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
                 <on_click function="ShowFloater" userdata="appearance" />
                 <on_enable function="Edit.EnableCustomizeAvatar" />
         </menu_item_call>
+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
+                <on_click function="Object.Edit" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
 </pie_menu>
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 247dc49..936c404 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
@@ -10,15 +10,15 @@
         </menu_item_call>
         <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
                 <on_click function="Object.Touch" />
-                <on_enable function="Object.EnableTouch" userdata="Touch" />
+                <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
         </menu_item_call>
         <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Object Sit">
                 <on_click function="Object.SitOrStand" />
-                <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" />
+                <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" name="EnableSitOrStand"/>
         </menu_item_call>
         <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
                 <on_click function="Tools.BuyOrTake" />
-                <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
+                <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" name="EnableBuyOrTake"/>
         </menu_item_call>
         <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
                 <on_click function="PayObject" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 1a6c66c..e93a57f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -3,9 +3,7 @@
         <menu_item_call enabled="true" label="Profile..." name="Profile...">
                 <on_click function="ShowAgentProfile" userdata="agent" />
         </menu_item_call>
-        <menu_item_call enabled="true" label="Groups..." name="Groups...">
-                <on_click function="ShowAgentGroups" userdata="agent" />
-        </menu_item_call>
+        <menu_item_separator />
         <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
                 <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
                         <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
@@ -62,7 +60,6 @@
                                 <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
                         </menu_item_call>
                 </pie_menu>
-                <menu_item_separator />
                 <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
                 <menu_item_separator />
                 <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
@@ -76,15 +73,13 @@
                 <on_click function="Self.StandUp" userdata="" />
                 <on_enable function="Self.EnableStandUp" />
         </menu_item_call>
-        <menu_item_call enabled="true" label="Friends..." name="Friends...">
-                <on_click function="ShowFloater" userdata="friends" />
-        </menu_item_call>
+        <menu_item_separator />
         <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
                 <on_click function="ShowFloater" userdata="gestures" />
         </menu_item_call>
-        <menu_item_separator />
         <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
                 <on_click function="ShowFloater" userdata="appearance" />
                 <on_enable function="Edit.EnableCustomizeAvatar" />
         </menu_item_call>
+        <menu_item_separator />
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index da1c219..b603bee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3226,7 +3226,7 @@ You are not allowed in that region due to your maturity Rating.
 You are not allowed in that Region due to your maturity Rating preference.
 
 You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
-         <form>
+         <form name="form">
       <button
        index="0"
        name="OK"
@@ -3236,7 +3236,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
        index="1"
        name="Cancel"
        text="Close"/>
-       <ignore text="When Region entry is blocked due to maturity Rating preference"/>
+       <ignore name="ignore" text="When Region entry is blocked due to maturity Rating preference"/>
     </form>
   </notification>
 
@@ -3506,7 +3506,7 @@ You can selectively choose which types of items to modify by using the checklist
 
 * This tool will only succeed at changing permissions on items you are allowed to change.
 * You cannot grant any Next owner permissions which you do not already have.
-* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none its permissions will change.
+* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none of its permissions will change.
 
 When you are ready to change the permissions in bulk, click &apos;Apply&apos; and wait for the results to display.
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index b516683..5989e7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -91,7 +91,7 @@
                  I want to access content rated:
         </text>
         <combo_box bottom="-328" follows="left|top" height="18" left="315"
-             mouse_opaque="true" name="maturity_desired_combobox" width="150">
+             mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
                 </combo_item>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index add894b..f48fa6e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -28,8 +28,8 @@
              width="350" />
         <check_box bottom="-65" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Local Chat" left="148" mouse_opaque="true"
-             name="include_im_in_chat_history" radio_style="false" width="237" />
+             label="Include IM in background console" left="148" mouse_opaque="true"
+             name="include_im_in_chat_console" radio_style="false" width="237" />
         <check_box bottom="-85" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_progress.xml b/linden/indra/newview/skins/default/xui/en-us/panel_progress.xml
index a6e1206..255079e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_progress.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_progress.xml
@@ -9,7 +9,7 @@
           <icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="640" height="250" follows="left|right|bottom|top"/>

           <text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="640" height="20" text_color="LoginProgressBoxTextColor" font-style="SHADOW" follows="left|right|top"/>

           <text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="640" height="20" text_color="LoginProgressBoxTextColor" font-style="SHADOW" follows="left|right|top"/>

-          <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-90" follows="left|right|top" />

+          <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />

           <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="600" height="100" text_color="LoginProgressBoxTextColor" font-style="SHADOW" follows="left|right|top|bottom"/>

         </layout_panel>

         <layout_panel name="panel5" min_width="10" height="200" width="640"/>