9 files changed, 39 insertions, 38 deletions

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 6f253a1..a012625 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="false" height="570" min_height="570" min_width="780"
      name="directory" rect_control="FloaterFindRect2"
      title="Search Second Life" width="780">
         <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
@@ -93,6 +93,7 @@
                                 height="16" />
                         <text hidden="true" name="loading_text">Loading...</text>
                         <text hidden="true" name="done_text">Done</text>
+                        <text hidden="true" name="redirect_404_url">http://secondlife.com/app/search/notfound.html</text>
                 </panel>
                 
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 52074c4..2e4171a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -7,17 +7,17 @@
         <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" />
         <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-             left="15" name="back_btn" width="70" />
+             left="15" name="back_btn" width="80" />
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="75" name="home_btn" width="70" />
+             label="Home" left_delta="83" name="home_btn" width="80" />
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Forward" left_delta="75" name="forward_btn" width="70" />
+             label="Forward" left_delta="83" name="forward_btn" width="80" />
              
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="75" max_length="256" mouse_opaque="true"
-             name="url_edit" select_all_on_focus_received="true" width="350" />
+             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="90" max_length="256" mouse_opaque="true"
+             name="url_edit" select_all_on_focus_received="true" width="345" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
-             label="Go" left_delta="360" name="go_btn" width="70" />
+             label="Go" left_delta="350" name="go_btn" width="70" />
              
         <!-- web_browser bottom="20" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" / -->
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index 9e2c410..de4dd6c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -5,7 +5,7 @@
         can_minimize="true"

     can_resize="false" 

     height="150" 

-    width="350"

+    width="370"

     name="floater_lagmeter" 

     title="Lag Meter"

     rect_control="FloaterLagMeter" >

@@ -44,7 +44,7 @@
                         name="client" 

                         v_pad="0" 

                         h_pad="0" 

-                        width="50"

+                        width="128"

                         height="16" >

                                 Client:

                         </text>

@@ -58,7 +58,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="66" 

+                        left="110" 

                         right="-10"

                         mouse_opaque="true"

                         name="client_text" 

@@ -149,7 +149,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="80" 

+                        left="110" 

                         right="-10"

                         mouse_opaque="true"

                         name="network_text" 

@@ -226,7 +226,7 @@
                         name="server" 

                         v_pad="0" 

                         h_pad="0" 

-                        width="50"

+                        width="60"

                         height="16" >

                                 Server:

                         </text>

@@ -240,7 +240,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="70" 

+                        left="85" 

                         right="-10"

                         mouse_opaque="true"

                         name="server_text" 

@@ -297,7 +297,7 @@
                         Lag Meter

                 </text>

                 <text hidden="true" name="max_width_px">

-                        350

+                        360

                 </text>

                 <text hidden="true" name="min_title_msg">

                         Lag

diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 50c69c6..366f50d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="365" name="floater_my_friends"

+<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="500" name="floater_my_friends"

      title="Contacts" 

      width="395">

         <tab_container bottom="10" height="360" tab_width="80" follows="left|right|top|bottom" left="0" name="friends_and_groups" tab_position="left" width="388">

diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index 180b00c..d4a0034 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -46,7 +46,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="select_object_label" v_pad="0" width="200">
+             mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
                 Click the button then the object:
         </text>
         <button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
@@ -147,12 +147,12 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="dscr_title" v_pad="0" width="50">
+             mouse_opaque="true" name="dscr_title" v_pad="0" width="180">
                 Details:
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="64"
+             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
              mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
 Please be specific about the date, location, nature of
 abuse, relevant chat/IM text, and select the object
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 26536ed..507649e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -136,16 +136,16 @@ vote on open proposals, and view old proposals.
              height="20" label="Cancel" label_selected="Cancel" left_delta="128"
              mouse_opaque="true" name="btn_cancel" width="75" />
         <button bottom="-218" follows="top" font="SansSerif" halign="center" height="20"
-             label="Yes" label_selected="Yes" left="246" mouse_opaque="true"
-             name="btn_yes" width="43" />
+             label="Yes" label_selected="Yes" left="200" mouse_opaque="true"
+             name="btn_yes" width="63" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="No" label_selected="No" left_delta="48"
-             mouse_opaque="true" name="btn_no" width="43" />
+             height="20" label="No" label_selected="No" left_delta="70"
+             mouse_opaque="true" name="btn_no" width="63" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Abstain" label_selected="Abstain" left_delta="48"
+             height="20" label="Abstain" label_selected="Abstain" left_delta="70"
              mouse_opaque="true" name="btn_abstain" width="63" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-255" drop_shadow_visible="true" follows="left|top"
+             bottom="-240" drop_shadow_visible="true" follows="left|top"
              font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="txt" v_pad="0" width="363">
                 Group Voting History
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index 7410c17..f213c07 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -34,16 +34,16 @@
         </text>
         <text bg_readonly_color="clear" bottom_delta="-28" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="resellable_clause"
-             text_readonly_color="white" width="300">
+             text_readonly_color="white" width="465">
                 Purchased land in this region may or may not be resold.
         </text>
         <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="changeable_clause"
-             text_readonly_color="white" width="375">
+             text_readonly_color="white" width="465">
                 Purchased land in this region may or may not be joined or subdivided.
         </text>
            <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
-             left_delta="0" name="covenent_instructions" width="440">
+             left_delta="0" name="covenent_instructions" width="465">
                 Drag and drop a notecard to change the Covenant for this Estate.
         </text>
         <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index 5b67146..9134e3f 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -13,17 +13,17 @@
              left="10" name="disable_scripts_check"
              tool_tip="Disable all scripts in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_scripts_help" width="18" />
+             left="160" name="disable_scripts_help" width="18" />
         <check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Collisions"
              left="10" name="disable_collisions_check"
              tool_tip="Disable non-avatar collisions in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_collisions_help" width="18" />
+             left="160" name="disable_collisions_help" width="18" />
         <check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Physics"
              left="10" name="disable_physics_check"
              tool_tip="Disable all physics in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_physics_help" width="18" />
+             left="160" name="disable_physics_help" width="18" />
         <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
              left="60" name="apply_btn" width="100" />
         <button bottom_delta="-50" follows="left|top" height="20" label="Choose Avatar..."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
index 5bd28fc..1c3d586 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
@@ -57,28 +57,28 @@
                 Northeast
         </text>
         <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="10" max_val="500" min_val="-500"
+             label_width="37" left="10" max_val="500" min_val="-500"
              name="height_start_spin_0" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="120" max_val="500" min_val="-500"
+             label_width="37" left="120" max_val="500" min_val="-500"
              name="height_start_spin_1" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="230" max_val="500" min_val="-500"
+             label_width="37" left="230" max_val="500" min_val="-500"
              name="height_start_spin_2" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="340" max_val="500" min_val="-500"
+             label_width="37" left="340" max_val="500" min_val="-500"
              name="height_start_spin_3" width="100" />
         <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="10" max_val="500" min_val="-500"
+             label_width="37" left="10" max_val="500" min_val="-500"
              name="height_range_spin_0" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="120" max_val="500" min_val="-500"
+             label_width="37" left="120" max_val="500" min_val="-500"
              name="height_range_spin_1" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="230" max_val="500" min_val="-500"
+             label_width="37" left="230" max_val="500" min_val="-500"
              name="height_range_spin_2" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="340" max_val="500" min_val="-500"
+             label_width="37" left="340" max_val="500" min_val="-500"
              name="height_range_spin_3" width="100" />
         <text bottom_delta="-40" follows="left|top" height="20" left="25"
              name="height_text_lbl10" width="480">