Second Life viewer sources 1.18.4.1-RC

22 files changed, 198 insertions, 206 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 58acba7..3a877ea 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -35,10 +35,6 @@
                              text_readonly_color="0.576471 0.662745 0.835294 1" width="370" word_wrap="true" 
                              embedded_items="false" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-80" drop_shadow_visible="true" enabled="false" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-                             left="4" mouse_opaque="true" name="SalePending" v_pad="0" width="364" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left="4" mouse_opaque="true" name="Owner:" v_pad="0" width="72">
@@ -105,6 +101,10 @@
                              width="206">
                                 Price: L$[PRICE].
                         </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-200" drop_shadow_visible="true" enabled="false" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+                             left="76" mouse_opaque="true" name="SalePending" v_pad="0" width="364" />
                         <button bottom="-204" enabled="true" follows="left|top" font="SansSerif"
                              halign="center" height="20" hidden="false" label="Sell Land..."
                              label_selected="Sell Land..." left="295" mouse_opaque="true"
@@ -610,14 +610,6 @@
                              height="16" hidden="false" initial_value="false" label="Mature Content"
                              left="14" mouse_opaque="true" name="MatureCheck" radio_style="false"
                              tool_tip="Your parcel information or content is considered mature." width="107" />
-                        <check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" hidden="false" initial_value="false"
-                             label="Publish listing on the web" left="178" mouse_opaque="true"
-                             name="PublishCheck" radio_style="false"
-                             tool_tip="Publish your parcel information on the web." width="164" />
-                        <button bottom="-160" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="16" hidden="false" label="?" label_selected="?"
-                             left="333" mouse_opaque="true" name="?" width="20" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
index 0af6d7e..d766a33 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
@@ -14,7 +14,7 @@
         </text>
         <line_editor bottom_delta="-2" follows="top|left|right" height="19" left="85"
              max_length="254" name="description_form" right="-10" />
-        <pad height="7" />
+        <pad height="0" />
         <spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0" 
                  label="Priority" label_width="50" left="10" max_val="4" min_val="0" name="priority"
              tool_tip="Controls which other animations can be overridden by this animation."
@@ -171,7 +171,7 @@
              max_val="10" min_val="0" name="ease_out_time"
              tool_tip="Amount of time (in seconds) over which animations blends out."
              width="135" />
-        <button bottom_delta="-32" follows="top|right" height="28" label="" left="10" name="play_btn"
+        <button bottom_delta="-42" follows="top|right" height="28" label="" left="10" name="play_btn"
              tool_tip="Play/pause your animation." width="28" />
         <button bottom_delta="0" follows="top|right" height="28" label="" left_delta="32"
              name="stop_btn" tool_tip="Stop animation playback" width="28" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml b/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
index cd276ec..adb7821 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
@@ -63,18 +63,12 @@
         <button bottom="-373" follows="left|top" font="SansSerif" halign="center" height="32"
              label="" label_selected="" left_delta="130" mouse_opaque="true"
              name="color_pipette" width="32" />
-        <!--button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
+        <button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Cancel" label_selected="Cancel" left_delta="75"
              mouse_opaque="true" name="cancel_btn" width="100" />
-        <button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Select" label_selected="Select" left_delta="104"
-             mouse_opaque="true" name="select_btn" width="100" /-->
         <button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Select" label_selected="Select" left_delta="75"
+             height="20" label="Select" label_selected="Select" left_delta="104"
              mouse_opaque="true" name="select_btn" width="100" />
-        <button bottom="-373" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Cancel" label_selected="Cancel" left_delta="104"
-             mouse_opaque="true" name="cancel_btn" width="100" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-188" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index f62a56b..8216069 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -163,17 +163,17 @@
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-                             mouse_opaque="true" name="text" v_pad="0" width="70">
+                             mouse_opaque="true" name="text" v_pad="0" width="90">
                                 Category:
                         </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="20" left="289"
-                             mouse_opaque="true" name="text2" v_pad="0" width="70">
+                             mouse_opaque="true" name="text2" v_pad="0" width="90">
                                 Name/Desc:
                         </text>
-                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="359"
-                             max_chars="20" mouse_opaque="true" name="category combo" width="200">
+                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="379"
+                             max_chars="20" mouse_opaque="true" name="category combo" width="180">
                         <!--text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
@@ -226,9 +226,9 @@
                                 </combo_item>
                         </combo_box>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"
-                             follows="left|top" font="SansSerifSmall" height="18" left="359"
+                             follows="left|top" font="SansSerifSmall" height="18" left="379"
                              max_length="32" mouse_opaque="true" name="event_search_text" tab_group="1"
-                             width="200" />
+                             width="180" />
                         <check_box bottom="-30" control_name="ShowMatureEvents" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false" label="Show Mature"
                              left="569" mouse_opaque="true" name="incmature" width="120" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
index 9490f16..2178b4a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
@@ -2,7 +2,7 @@
 <floater bottom="-534" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="384" hidden="false" left="433" min_height="384"
      min_width="400" mouse_opaque="true" name="godtools floater"
-     title="God Tools" width="700">
+     title="God Tools" width="400">
         <tab_container bottom="-384" follows="left|top" height="364" hidden="false" left="0"
              mouse_opaque="false" name="GodTools Tabs" tab_position="top" width="400">
                 <panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
index 211b6ee..77fa57e 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
@@ -4,42 +4,42 @@
      min_width="240" mouse_opaque="true" name="build options floater"
      rect_control="FloaterJoystickRect" title="Flycam Options" width="400">
      
-     <text bottom="-40" left="14">X-Axis</text>
-     <text bottom="-40" left="142">Y-Axis</text>
-     <text bottom="-40" left="270">Z-Axis</text>
+     <text bottom="-40" left="14" name="x-axis">X-Axis</text>
+     <text bottom="-40" left="142" name="y-axis">Y-Axis</text>
+     <text bottom="-40" left="270" name="z-axis">Z-Axis</text>
      
-     <spinner bottom="-61" left="14" width="120" label_width="64" control_name="FlycamAxis1" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-     <spinner bottom="-61" left="142" width="120" label_width="64" control_name="FlycamAxis2" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-         <spinner bottom="-61" left="270" width="120" label_width="64" control_name="FlycamAxis0" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
+     <spinner bottom="-61" left="14" width="120" label_width="64" control_name="FlycamAxis1" name="FlycamAxis1" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+     <spinner bottom="-61" left="142" width="120" label_width="64" control_name="FlycamAxis2" name="FlycamAxis2" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+         <spinner bottom="-61" left="270" width="120" label_width="64" control_name="FlycamAxis0" name="FlycamAxis0" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
          
-         <spinner bottom="-82" left="14" width="120" label_width="64" control_name="FlycamAxisScale1" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-     <spinner bottom="-82" left="142" width="120" label_width="64" control_name="FlycamAxisScale2" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-         <spinner bottom="-82" left="270" width="120" label_width="64" control_name="FlycamAxisScale0" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
+         <spinner bottom="-82" left="14" width="120" label_width="64" control_name="FlycamAxisScale1" name="FlycamAxisScale1" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+     <spinner bottom="-82" left="142" width="120" label_width="64" control_name="FlycamAxisScale2" name="FlycamAxisScale2" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+         <spinner bottom="-82" left="270" width="120" label_width="64" control_name="FlycamAxisScale0" name="FlycamAxisScale0" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
         
-         <spinner bottom="-103" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone1" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-     <spinner bottom="-103" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone2" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-         <spinner bottom="-103" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone0" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
+         <spinner bottom="-103" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+     <spinner bottom="-103" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+         <spinner bottom="-103" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
         
-         <text bottom="-132" left="14">Yaw</text>
-     <text bottom="-132" left="142">Pitch</text>
-     <text bottom="-132" left="270">Roll</text>
+         <text bottom="-132" left="14" name="yaw">Yaw</text>
+     <text bottom="-132" left="142" name="pitch">Pitch</text>
+     <text bottom="-132" left="270" name="roll">Roll</text>
      
-         <spinner bottom="-153" left="14" width="120" label_width="64" control_name="FlycamAxis5" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-     <spinner bottom="-153" left="142" width="120" label_width="64" control_name="FlycamAxis4" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-         <spinner bottom="-153" left="270" width="120" label_width="64" control_name="FlycamAxis3" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
+         <spinner bottom="-153" left="14" width="120" label_width="64" control_name="FlycamAxis5" name="FlycamAxis5" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+     <spinner bottom="-153" left="142" width="120" label_width="64" control_name="FlycamAxis4" name="FlycamAxis4" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+         <spinner bottom="-153" left="270" width="120" label_width="64" control_name="FlycamAxis3" name="FlycamAxis3" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>   
          
-         <spinner bottom="-174" left="14" width="120" label_width="64" control_name="FlycamAxisScale5" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-     <spinner bottom="-174" left="142" width="120" label_width="64" control_name="FlycamAxisScale4" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-         <spinner bottom="-174" left="270" width="120" label_width="64" control_name="FlycamAxisScale3" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
+         <spinner bottom="-174" left="14" width="120" label_width="64" control_name="FlycamAxisScale5" name="FlycamAxisScale5" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+     <spinner bottom="-174" left="142" width="120" label_width="64" control_name="FlycamAxisScale4" name="FlycamAxisScale4" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+         <spinner bottom="-174" left="270" width="120" label_width="64" control_name="FlycamAxisScale3" name="FlycamAxisScale3" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>   
         
-         <spinner bottom="-195" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone5" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-     <spinner bottom="-195" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone4" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-         <spinner bottom="-195" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone3" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
+         <spinner bottom="-195" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+     <spinner bottom="-195" left="142" width="120" label_width="64" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+         <spinner bottom="-195" left="270" width="120" label_width="64" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>   
             
          <text name="ZoomLabel" bottom="-224" left="14">Zoom</text>
-        <spinner bottom="-245" left="14" width="120" label_width="64" control_name="FlycamAxis6" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>         
-        <spinner bottom="-266" left="14" width="120" label_width="64" control_name="FlycamAxisScale6" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-         <spinner bottom="-287" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone6" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-245" left="14" width="120" label_width="64" control_name="FlycamAxis6" name="FlycamAxis6" label="Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>      
+        <spinner bottom="-266" left="14" width="120" label_width="64" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="Scale" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+         <spinner bottom="-287" left="14" width="120" label_width="64" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="Dead Zone" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
          <check_box bottom_delta="-21" control_name="FlycamZoomDirect" label="Direct Zoom" />
          
          <slider bottom_delta="-29" can_edit_text="false" control_name="FlycamFeathering"
@@ -48,8 +48,8 @@
              mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
              width="128" />
            
-        <check_box bottom_delta="-21" control_name="FlycamAutoLeveling" label="Auto Level" />
-        <check_box bottom_delta="-21" control_name="FlycamAbsolute" label="3D Cursor" />
+        <check_box bottom_delta="-21" control_name="FlycamAutoLeveling" name="FlycamAutoLeveling" label="Auto Level" />
+        <check_box bottom_delta="-21" control_name="FlycamAbsolute" name="FlycamAbsolute" label="3D Cursor" />
         
         <text hidden="true" name="JoystickMonitor">Joystick Monitor</text>
         <text hidden="true" name="Axis">Axis [NUM]</text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
index 612d96a..8b730f8 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
@@ -38,7 +38,7 @@
              bottom="-337" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="348"
              mouse_opaque="true" name="allowed_text" v_pad="0" width="132">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-357" drop_shadow_visible="true" follows="left|top"
@@ -50,7 +50,7 @@
              bottom="-357" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="348"
              mouse_opaque="true" name="current_text" v_pad="0" width="132">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-377" drop_shadow_visible="true" follows="left|top"
@@ -62,6 +62,7 @@
              bottom="-377" drop_shadow_visible="true" follows="left|top"
              font="SansSerifBold" h_pad="0" halign="left" height="16" left_delta="348"
              mouse_opaque="true" name="available_text" v_pad="0" width="132">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
+        <string name="area_string">[AREA] sq. meters</string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 9032ecd..a2ad5f1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -87,12 +87,12 @@
         <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="14" hidden="false"
-             left="6" mouse_opaque="true" name="text ruler mode" v_pad="0" width="64">
+             left="6" mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
                 Ruler mode:
         </text>
         <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-             hidden="false" left_delta="70" max_chars="20" mouse_opaque="true"
-             name="combobox grid mode" width="90">
+             hidden="false" left_delta="74" max_chars="20" mouse_opaque="true"
+             name="combobox grid mode" width="86">
                 <combo_item name="World" value="World">
                         World
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
index 079e7c4..536e578 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
@@ -8,10 +8,10 @@
      <panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"

             name="content_panel" width="404">

        <!--<button bottom="0" height="20" label="Help" left="0" name="help_btn" width="70" />-->

-       <button bottom="0" height="20" label="Previous" left="105" name="back_btn" width="70" />

-       <button bottom="0" height="20" label="Next" left_delta="75" name="next_btn" width="70" />

-       <button bottom="0" height="20" label="Finish" left_delta="80" name="ok_btn" width="70" />

-       <button bottom="0" height="20" label="Cancel" left_delta="75" name="cancel_btn"

-               width="70" />

+       <button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" />

+       <button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" />

+       <button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" />

+       <button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn"

+               width="80" />

      </panel>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index 55e5ac0..cb6835c 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -400,18 +400,18 @@
                                 <on_check control="ShowAllObjectHoverTip" />
                         </menu_item_check>
                 </menu>
-                <menu_item_check bottom="-384" enabled="true" height="19" hidden="false"
-                     label="Beacons Always On" left="0" mouse_opaque="true"
-                     name="Beacons Always On" width="211" shortcut="control|N">
-                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-                        <on_check control="BeaconAlwaysOn" />
-                </menu_item_check>
                 <menu_item_check bottom="-403" enabled="true" height="19" hidden="false"
                      label="Highlight Transparent" left="0" mouse_opaque="true"
                      name="Highlight Transparent" shortcut="control|alt|T" width="211">
                         <on_click function="View.HighlightTransparent" userdata="" />
                         <on_check function="View.CheckHighlightTransparent" />
                 </menu_item_check>
+                <menu_item_check bottom="-384" enabled="true" height="19" hidden="false"
+                     label="Beacons Always On" left="0" mouse_opaque="true"
+                     name="Beacons Always On" width="211" shortcut="control|N">
+                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
+                        <on_check control="BeaconAlwaysOn" />
+                </menu_item_check>
                 <menu bottom="-554" drop_shadow="true" enabled="true" height="117"
                      hidden="false" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
                      opaque="true" tear_off="true" create_jump_keys="true" width="129">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
index 203f70e..e237f99 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -10,30 +10,30 @@
         <slider bottom_delta="-20" control_name="AudioLevelMaster" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="System Volume" width="120"
-             label="Master" show_text="false" label_width="50" volume="true" />
+             label="Master" show_text="false" label_width="55" volume="true" />
         <slider bottom_delta="-20" control_name="AudioLevelMusic" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="Music Volume" width="120"
-             label="Music" show_text="false" label_width="50" volume="true" />
+             label="Music" show_text="false" label_width="55" volume="true" />
         <slider bottom_delta="-20" control_name="AudioLevelMedia" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="Media Volume" width="120"
-             label="Media" show_text="false" label_width="50" volume="true" />
+             label="Media" show_text="false" label_width="55" volume="true" />
         <slider bottom_delta="-20" control_name="AudioLevelVoice" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="Voice Volume" width="120"
-             label="Voice" show_text="false" label_width="50" volume="true" />
+             label="Voice" show_text="false" label_width="55" volume="true" />
 
         <slider bottom_delta="-20" control_name="AudioLevelSFX" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="SFX Volume" width="120"
-             label="Sounds" show_text="false" label_width="50" volume="true" />
+             label="Sounds" show_text="false" label_width="55" volume="true" />
         <slider bottom_delta="-20" control_name="AudioLevelAmbient" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="Wind Volume" width="120"
-             label="Ambient" show_text="false" label_width="50" volume="true" />
+             label="Ambient" show_text="false" label_width="55" volume="true" />
         <slider bottom_delta="-20" control_name="AudioLevelUI" enabled="true" follows="left|top"
              height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
              max_val="1" min_val="0" mouse_opaque="true" name="UI Volume" width="120"
-             label="UI" show_text="false" label_width="50" volume="true" />
+             label="UI" show_text="false" label_width="55" volume="true" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 4e9bcd2..884ff6f 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -31,144 +31,144 @@
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="61">
+                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
                                 Name:
                         </text>
                         <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="66"
+                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
                              max_length="254" mouse_opaque="false" name="name"
                              text_readonly_color="1, 1, 1, 1" width="180" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="200"
-                             mouse_opaque="true" name="online_yes" v_pad="0" width="130">
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="209"
+                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">
                                 Currently Online
                         </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="270"
-                             mouse_opaque="true" name="label" v_pad="0" width="130">
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
+                             mouse_opaque="true" name="label" v_pad="0" width="121">
                                 Born:
                         </text>
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="270"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
                              max_length="254" mouse_opaque="false" name="born"
-                             text_readonly_color="1, 1, 1, 1" width="130" />
+                             text_readonly_color="1, 1, 1, 1" width="121" />
                         <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="270"
-                             mouse_opaque="true" name="label2" v_pad="0" width="130">
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
+                             mouse_opaque="true" name="label2" v_pad="0" width="121">
                                 Account:
                         </text>
-                        <view_border blevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="270"
-                             mouse_opaque="false" name="acct_border" width="130" />
+                        <view_border blevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279"
+                             mouse_opaque="false" name="acct_border" width="121" />
                         <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" height="32" left="270"
-                             mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="130" />
+                             follows="left|top" font="SansSerifSmall" height="32" left="279"
+                             mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
                         <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="270"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
                              mouse_opaque="true" name="partner_label"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
                              v_pad="0" width="130">
                                 Partner:
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="45"
+                             height="18" label="?" label_selected="?" left_delta="53"
                              mouse_opaque="true" name="partner_help" width="18" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="270"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
                              max_length="254" mouse_opaque="false" name="partner_edit"
                              text_readonly_color="1, 1, 1, 1"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             width="130">
+                             width="121">
                                 [FIRST] [LAST]
                         </line_editor>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-44" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">
+                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">
                                 Photo:
                         </text>
                         <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
                              default_image_name="None" follows="left|top" height="151" label=""
-                             left="70" mouse_opaque="true" name="img"
+                             left="79" mouse_opaque="true" name="img"
                              tool_tip="Click to choose a picture" width="180" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-183" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Groups:" v_pad="0" width="61">
+                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
                                 Groups:
                         </text>
                         <scroll_list background_visible="false" bottom="-258" column_padding="5" draw_border="true"
                              fg_disable_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top" height="90" left="70" mouse_opaque="false"
-                             multi_select="false" name="groups" width="330" />
+                             follows="left|top" height="90" left="79" mouse_opaque="false"
+                             multi_select="false" name="groups" width="321" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-280" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="About:" v_pad="0" width="61">
+                             mouse_opaque="true" name="About:" v_pad="0" width="70">
                                 About:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="65">
+                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
                                 (500 chars)
                         </text>
                         <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-375" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-                             is_unicode="false" left="70" max_length="511" mouse_opaque="true"
-                             name="about" text_readonly_color="1, 1, 1, 1" width="330" word_wrap="true" />
+                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
+                             name="about" text_readonly_color="1, 1, 1, 1" width="321" word_wrap="true" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-403" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="Give item:" v_pad="0" width="69">
+                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">
                                 Give item:
                         </text>
                         <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
                              height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-                             width="418" />
-                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="66"
-                             mouse_opaque="false" name="drop_target_rect_vis" width="330" />
+                             width="409" />
+                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
+                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />
                         <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="center" height="16" left_delta="0"
                              mouse_opaque="true" name="Give inventory"
                              tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-                             width="330">
+                             width="321">
                                 Drop inventory item here.
                         </text>
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show In Search" left="70"
+                             initial_value="false" label="Show In Search" left="75"
                              mouse_opaque="true" name="allow_publish"
                              tool_tip="Publish extra profile information such as description and image in Search." width="130" />
                         <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
-                             label="?" label_selected="?" left_delta="140" mouse_opaque="true" name="?"
+                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
                              width="20" />
                         <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-                             label_selected="Find on Map" left="34" mouse_opaque="true"
+                             label_selected="Find on Map" left="24" mouse_opaque="true"
                              name="Find on Map" width="100" />
                         <button bottom_delta="0" font="SansSerif" halign="center" height="20"
                              label="Offer Teleport..." label_selected="Offer Teleport..."
-                             left_delta="112" mouse_opaque="true" name="Offer Teleport..." width="140" />
+                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
                         <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Add Friend..."
-                             label_selected="Add Friend..." left_delta="152" mouse_opaque="true"
-                             name="Add Friend..." width="100" />
+                             label_selected="Add Friend..." left_delta="142" mouse_opaque="true"
+                             name="Add Friend..." width="130" />
                         <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
-                             label_selected="Pay..." left="34" mouse_opaque="true" name="Pay..."
+                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
                              width="100" />
                         <button bottom_delta="0" font="SansSerif" halign="center" height="20"
                              label="Instant Message..." label_selected="Instant Message..."
-                             left_delta="112" mouse_opaque="true" name="Instant Message..." width="140" 
+                             left_delta="102" mouse_opaque="true" name="Instant Message..." width="140" 
                              tool_tip="Instant Message (IM)"/>
                         <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
-                             label_selected="Mute" left_delta="152" mouse_opaque="true" name="Mute"
-                             width="100" />
+                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
+                             width="130" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
@@ -210,11 +210,11 @@
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-36" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="I Want To:" v_pad="0" width="61">
+                             mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
                                 I Want To:
                         </text>
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Build" left_delta="66" mouse_opaque="true"
+                             initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
                              name="chk0" width="90" />
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
@@ -239,17 +239,17 @@
                              name="chk7" width="92" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="70"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="want_to_edit"
                              text_readonly_color="1, 1, 1, 1" width="330" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Skills:" v_pad="0" width="61">
+                             mouse_opaque="true" name="Skills:" v_pad="0" width="70">
                                 Skills:
                         </text>
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Textures" left_delta="66" mouse_opaque="true"
+                             initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
                              name="schk0" width="90" />
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Architecture" left_delta="170"
@@ -268,18 +268,18 @@
                              mouse_opaque="true" name="schk5" width="127" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="70"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="skills_edit"
                              text_readonly_color="1, 1, 1, 1" width="330" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Languages:" v_pad="0" width="61">
+                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">
                                 Languages:
                         </text>
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="70"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="languages_edit"
                              text_readonly_color="1, 1, 1, 1" width="330" />
                 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
index 21a706e..4bb4988 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
@@ -18,11 +18,11 @@
         <button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
              name="set_location_btn" width="60" />
         <button bottom_delta="-28" follows="left|top" height="20" label="Teleport" left="20"
-             name="classified_teleport_btn" width="80" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="105"
+             name="classified_teleport_btn" width="100" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="125"
              name="classified_map_btn" width="100" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Profile" left="210"
-             name="classified_profile_btn" width="70" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Profile" left="230"
+             name="classified_profile_btn" width="100" />
         <check_box bottom="422" follows="left|top" height="20" label="Mature" left="30"
              name="classified_mature_check" text_readonly_color="white" width="80" />
         <combo_box bg_readonly_color="grey" bottom="445" follows="left|top" height="18" label=""
diff --git a/linden/indra/newview/skins/xui/en-us/panel_event.xml b/linden/indra/newview/skins/xui/en-us/panel_event.xml
index f217bea..9cd58c6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_event.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_event.xml
@@ -76,13 +76,13 @@
         <text_editor bottom_delta="-230" follows="left|top" height="220" left="20" max_length="1024"
              name="event_desc" width="400" />
         <button bottom_delta="-24" follows="left|top" height="20" label="Teleport" left="20"
-             name="teleport_btn" width="80" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="105"
-             name="map_btn" width="100" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Notify" left="210"
-             name="notify_btn" width="90" />
+             name="teleport_btn" width="140" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="165"
+             name="map_btn" width="140" />
+        <button bottom_delta="-20" follows="left|top" height="20" label="Notify" left="20"
+             name="notify_btn" width="140" />
         <button bottom_delta="0" follows="left|top" height="20" label="Create Event..."
-             left="305" name="create_event_btn" width="110" />
+             left="165" name="create_event_btn" width="140" />
         <text name="none" hidden="true">none</text>
         <text name="notify" hidden="true">Notify</text>
         <text name="dont_notify" hidden="true">Don't Notify</text>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
index 7896844..05252ab 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
@@ -8,6 +8,7 @@ general Group Preferences and member options.
 
 Hover your mouse over the options for more help.
         </text>
+        <string name="group_info_unchanged">General group information has changed.</string>
         <button bottom="-24" follows="left|top" font="SansSerif" halign="center" height="16"
              label="?" label_selected="?" left="391" mouse_opaque="true"
              name="help_button" width="20" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
index fce837e..8e078c3 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
@@ -48,7 +48,7 @@ provide information about the group&apos;s finances.
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="125"
              mouse_opaque="true" name="total_contributed_land_value" v_pad="0"
              width="100">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
@@ -60,7 +60,7 @@ provide information about the group&apos;s finances.
              bottom_delta="0" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="125"
              mouse_opaque="true" name="total_land_in_use_value" v_pad="0" width="150">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
@@ -72,7 +72,7 @@ provide information about the group&apos;s finances.
              bottom_delta="0" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="125"
              mouse_opaque="true" name="land_available_value" v_pad="0" width="120">
-                0 sq. meters
+                [AREA] sq. meters
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
@@ -85,18 +85,13 @@ provide information about the group&apos;s finances.
              left_delta="125" max_length="10" mouse_opaque="true"
              name="your_contribution_line_editor" prevalidate="non_negative_s32"
              width="70" />
+        <string name="land_contrib_error">Unable to set your land contribution.</string>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-2" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="75"
-             mouse_opaque="true" name="your_contribution_max_value_append" v_pad="0"
-             width="58">
-                sq. meters
-        </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="58"
-             mouse_opaque="true" name="your_contribution_max_value" v_pad="0" width="100" visible="false">
-                ([AMOUNT] max)
+             mouse_opaque="true" name="your_contribution_max_value" v_pad="0"
+             width="200">
+                sq. meters ([AMOUNT] max)
         </text>
         <icon bottom_delta="-27" height="16" image_name="smicon_warn.tga" left="9"
              name="group_over_limit_icon" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
index 09ea84e..592d458 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
@@ -27,10 +27,10 @@ the General tab.
                 Notices are kept for 30 days. Click the notice below you wish to view.
 Click the &apos;Refresh&apos; button to check if new notices have been received.
         </text>
-        <scroll_list background_visible="false" bottom_delta="-130" column_padding="0"
+        <scroll_list background_visible="false" bottom_delta="-137" column_padding="0"
              draw_border="true" draw_heading="true" enabled="true"
              fg_unselected_color="200,200,200,255" heading_font="SansSerifSmall"
-             heading_height="14" height="116" left="7" mouse_opaque="true"
+             heading_height="14" height="109" left="7" mouse_opaque="true"
              multi_select="false" name="notice_list" width="404">
                 <column label="" name="icon" width="16" />
                 <column label="Subject" name="subject" width="171" />
@@ -47,7 +47,7 @@ Click the &apos;Refresh&apos; button to check if new notices have been received.
         <button bottom_delta="0" font="SansSerif" halign="center" height="20"
              label="Refresh" label_selected="Refresh List" left="321"
              mouse_opaque="true" name="refresh_notices" width="90" />
-        <panel border="false" bottom="0" follows="all" height="275" label="Create New Notice"
+        <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
              left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
@@ -93,15 +93,15 @@ and you can&apos;t send a folder.
                 <line_editor bg_visible="false" border_visible="false" bottom_delta="-2" enabled="false"
                      font="SansSerifSmall" height="16" is_unicode="false" left_delta="59"
                      max_length="63" mouse_opaque="false" name="create_inventory_name"
-                     text_readonly_color="0.784, 0.819, 0.8, 1" width="264" />
+                     text_readonly_color="0.784, 0.819, 0.8, 1" width="211" />
                 <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                      name="create_inv_icon" width="16" />
-                <button bottom_delta="-22" font="SansSerif" halign="center" height="20"
-                     label="Remove Attachment" label_selected="Remove Attachment" left="66"
-                     mouse_opaque="true" name="remove_attachment" width="135" />
                 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-                     label="Send Notice" label_selected="Send Notice" left="310"
-                     mouse_opaque="true" name="send_notice" width="100" />
+                     label="Remove Attachment" label_selected="Remove Attachment" left="279"
+                     mouse_opaque="true" name="remove_attachment" width="135" />
+                <button bottom_delta="-20" font="SansSerif" halign="center" height="20"
+                     label="Send Notice" label_selected="Send Notice" left="279"
+                     mouse_opaque="true" name="send_notice" width="135" />
                 <panel bevel_style="in" border="true" bottom="172" height="76" left="335"
                      name="drop_target2" width="76" />
                 <icon bottom_delta="7" height="64" image_name="icon_groupnoticeinventory.tga"
@@ -110,7 +110,7 @@ and you can&apos;t send a folder.
                      tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
                      width="422" />
         </panel>
-        <panel border="false" bottom="0" follows="all" height="275" label="View Past Notice"
+        <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
              left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index a821956..6f9880c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -17,8 +17,8 @@
              height="20" left="20" name="location_editor" text_readonly_color="white"
              width="360" />
         <button bottom_delta="-30" follows="left|top" height="20" label="Teleport" left="20"
-             name="teleport_btn" width="80" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="105"
+             name="teleport_btn" width="100" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="125"
              name="map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
              name="auction_btn" width="80" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index 6792202..79ebb7e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -2,8 +2,8 @@
      height="408" hidden="false" label="General" left="102" mouse_opaque="true"
      name="general_panel" width="517">
         <combo_box allow_text_entry="true" bottom="-24" enabled="true" follows="left|bottom"
-             height="16" hidden="false" left="148" max_chars="128" mouse_opaque="true"
-             name="location_combobox" width="128" >
+             height="16" hidden="false" left="155" max_chars="128" mouse_opaque="true"
+             name="location_combobox" width="146" >
                 <combo_item name="MyHome" value="My Home">
                         My Home
                 </combo_item>
@@ -13,65 +13,65 @@
         </combo_box>     
         <check_box bottom="-44" control_name="ShowStartLocation" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-             label="Show Start Location on Login Screen" left="148" mouse_opaque="true"
+             label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
              name="show_location_checkbox" radio_style="false" width="256" />
         <radio_group bottom="-108" control_name="RenderName" draw_border="true" enabled="true"
-             follows="left|top" height="54" hidden="false" left="148"
+             follows="left|top" height="54" hidden="false" left="155"
              mouse_opaque="true" name="fade_out_radio" width="128">
                 <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="3" mouse_opaque="true" name="Never" width="463">
+                     left="6" mouse_opaque="true" name="Never" width="463">
                         Never
                 </radio_item>
                 <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="3" mouse_opaque="true" name="Temporarily" width="463">
+                     left="6" mouse_opaque="true" name="Temporarily" width="463">
                         Show Temporarily
                 </radio_item>
                 <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="3" mouse_opaque="true" name="Always" width="463">
+                     left="6" mouse_opaque="true" name="Always" width="463">
                         Always
                 </radio_item>
         </radio_group>
         <check_box bottom="-134" control_name="RenderNameHideSelf" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Hide My Name On My Screen" left="148"
+             initial_value="false" label="Hide My Name On My Screen" left="151"
              mouse_opaque="true" name="show_my_name_checkbox" radio_style="false"
              width="256" />
         <check_box bottom="-152" control_name="RenderHideGroupTitle" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Hide My Group Title" left="148"
+             initial_value="false" label="Hide My Group Title" left="151"
              mouse_opaque="true" name="show_my_title_checkbox" radio_style="false"
              width="256" />
         <check_box bottom="-170" control_name="SmallAvatarNames" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-             label="Small Avatar Names" left="148" mouse_opaque="true"
+             label="Small Avatar Names" left="151" mouse_opaque="true"
              name="small_avatar_names_checkbox" radio_style="false" width="256" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-236"
              can_apply_immediately="false" color="1 1 1 1" control_name="EffectColor"
              enabled="true" follows="left|top" height="56" hidden="false" label=""
-             left="148" mouse_opaque="true" name="effect_color_swatch"
+             left="153" mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="40" />
         <spinner bottom="-246" control_name="AFKTimeout" enabled="true" follows="left|top"
              height="16" hidden="false" increment="1" initial_val="300"
-             label="Away Timeout:" label_width="138" left="10" max_val="600"
+             label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />      
         <check_box bottom="-272" control_name="ChatOnlineNotification" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Show Online Friend Notifications" left="148"
+             initial_value="false" label="Show Online Friend Notifications" left="151"
              mouse_opaque="true" name="friends_online_notify_checkbox"
              radio_style="false" width="256" />
         <check_box bottom="-290" control_name="MiniMapRotate" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Rotate Mini-Map" left="148" mouse_opaque="true"
+             label="Rotate Mini-Map" left="151" mouse_opaque="true"
              name="rotate_mini_map_checkbox" radio_style="false" width="256" />
         <check_box bottom="-308" control_name="NotifyMoneyChange" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false"
-             label="Notify when Linden dollars (L$) spent or received" left="148"
+             label="Notify when Linden dollars (L$) spent or received" left="151"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
         <check_box bottom="-326" control_name="UseDefaultColorPicker" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Use default system color picker" left="148"
+             initial_value="false" label="Use default system color picker" left="151"
              mouse_opaque="true" name="use_system_color_picker_checkbox"
              radio_style="false"
              tool_tip="Use the default system color picker instead of the one built into Second Life."
@@ -100,7 +100,7 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-240" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="222" mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
+             left="220" mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
                 seconds
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -119,7 +119,7 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" hidden="false" left_delta="289" mouse_opaque="true"
+             height="18" hidden="false" left_delta="290" mouse_opaque="true"
              name="language_textbox2" v_pad="0" width="394">
                 (Requires restart for full effect)
         </text>
@@ -127,8 +127,8 @@
                 &lt;Type region name&gt;
         </text>
         <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top"
-             height="18" hidden="false" left="148" max_chars="20" mouse_opaque="true"
-             name="crash_behavior_combobox" width="128">
+             height="18" hidden="false" left="153" max_chars="20" mouse_opaque="true"
+             name="crash_behavior_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
                         Ask before sending
                 </combo_item>
@@ -140,7 +140,7 @@
                 </combo_item>
         </combo_box>
         <combo_box allow_text_entry="true" bottom="-394" control_name="Language" enabled="true"
-             follows="left|bottom" height="16" hidden="false" left="148" max_chars="135"
+             follows="left|bottom" height="16" hidden="false" left="153" max_chars="135"
              mouse_opaque="true" name="language_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
                         System Default
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index a48e7d0..2c72b40 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -13,7 +13,7 @@
              width="256" />
         <combo_box allow_text_entry="false" bottom="-47" enabled="false" follows="left|top"
              height="18" hidden="false" left="160" max_chars="20" mouse_opaque="true"
-             name="fullscreen combo" width="150" />
+             name="fullscreen combo" width="160" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
@@ -29,7 +29,7 @@
         </text>
         <combo_box allow_text_entry="true" bottom="-66" enabled="true" follows="left|top"
              height="16" hidden="false" left="160" max_chars="100" mouse_opaque="true"
-             name="aspect_ratio" width="150">
+             name="aspect_ratio" width="160">
                 <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
                         4:3 (Standard CRT)
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index 137616c..c728e23 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -14,15 +14,24 @@
              initial_value="false" label="Enable voice chat" left="8"
              mouse_opaque="true" name="enable_voice_check" radio_style="false"
              width="200" />
-        <radio_group bottom_delta="-40" draw_border="false"

-             follows="left|top" height="40" left_delta="20" name="ear_location" width="364">

-                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">

-                        Hear Voice Chat from camera position.

-                </radio_item>

-                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">

-                        Hear Voice Chat from avatar position.

-                </radio_item>

-        </radio_group>

+        <radio_group bottom_delta="-40" draw_border="false"
+
+             follows="left|top" height="40" left_delta="20" name="ear_location" width="364">
+
+                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
+
+                        Hear Voice Chat from camera position.
+
+                </radio_item>
+
+                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
+
+                        Hear Voice Chat from avatar position.
+
+                </radio_item>
+
+        </radio_group>
+
 
         <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
              embedded_items="false" enabled="true" follows="left|top"
@@ -58,13 +67,13 @@
         <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
              drop_shadow_visible="true" enabled="false" follows="top|left"
              font="SansSerifSmall" halign="right" height="19" left_delta="0"
-             max_length="254" mouse_opaque="false" name="modifier_combo" control_name="PushToTalkButton" width="255" />
+             max_length="254" mouse_opaque="false" name="modifier_combo" control_name="PushToTalkButton" width="280" />
 
         <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
              height="20" label="Set Key" left_delta="0"
-             mouse_opaque="true" name="set_voice_hotkey_button" width="90" />
+             mouse_opaque="true" name="set_voice_hotkey_button" width="115" />
         <button bottom_delta="0" follows="left" font="SansSerif" halign="center"
-             height="20" label="Middle Mouse Button" left_delta="95"
+             height="20" label="Middle Mouse Button" left_delta="120"
              mouse_opaque="true" name="set_voice_middlemouse_button" width="160" />
 
         <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
@@ -82,8 +91,8 @@
 
         <button bottom_delta="-30" follows="left|top" font="SansSerif"
              height="20" label="Device Settings..." left_delta="-20"
-             mouse_opaque="true" name="device_settings_btn" width="120" />
+             mouse_opaque="true" name="device_settings_btn" width="150" />
         <button bottom_delta="-30" follows="left|top" font="SansSerif"
              height="20" label="Run Voice Setup Wizard..." left_delta="0"
-             mouse_opaque="true" name="launch_voice_wizard_button" width="170" />
+             mouse_opaque="true" name="launch_voice_wizard_button" width="225" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
index 040782b..b743088 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
@@ -36,11 +36,11 @@
         <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"

              control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"

              follows="top|left" font="SansSerifSmall" halign="right" height="19"

-             left_delta="0" max_length="254" name="modifier_combo" width="255" />

+             left_delta="0" max_length="254" name="modifier_combo" width="280" />

         <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"

              height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"

-             width="90" />

+             width="115" />

         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

-             height="20" label="Middle Mouse Button" left_delta="95"

+             height="20" label="Middle Mouse Button" left_delta="120"

              name="set_voice_middlemouse_button" width="160" />

 </panel>