Merge from default branch

--HG--
branch : product-engine

12 files changed, 84 insertions, 83 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8d45bdd4aa..2b0cb66f61 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -407,7 +407,7 @@ Leyla Linden               </text>
              name="Cancel Land Sale"
              left_pad="5"
              top_pad="-25"
-             width="145" />
+             width="155" />
             <text
              type="string"
              length="1"
@@ -1516,7 +1516,7 @@ Only large parcels can be listed in search.
              name="Clear"
              tool_tip="Clear the landing point"
              right="-10"
-             width="50" />
+             width="55" />
             <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index fd10938539..6f2b0fc3ea 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -307,7 +307,7 @@
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="190"
+             right="186"
              top="477"
              width="82" />
             <button
@@ -319,7 +319,7 @@
              name="Save As"
              top="477"
              right="304"
-             width="110" />
+             width="115" />
         </panel>
         <panel
          border="false"
@@ -489,7 +489,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Skin:
             </text>
@@ -548,7 +548,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -561,7 +561,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -739,7 +739,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Hair:
             </text>
@@ -771,7 +771,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -784,7 +784,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -924,7 +924,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Eyes:
             </text>
@@ -955,7 +955,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -968,7 +968,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1069,7 +1069,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1082,7 +1082,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1193,7 +1193,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shirt:
             </text>
@@ -1272,7 +1272,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1285,7 +1285,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1396,7 +1396,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Pants:
             </text>
@@ -1538,7 +1538,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shoes:
             </text>
@@ -1579,7 +1579,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1592,7 +1592,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1741,7 +1741,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Socks:
             </text>
@@ -1782,7 +1782,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1795,7 +1795,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1944,7 +1944,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Jacket:
             </text>
@@ -1996,7 +1996,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2009,7 +2009,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2158,7 +2158,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Gloves:
             </text>
@@ -2199,7 +2199,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2212,7 +2212,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2361,7 +2361,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Undershirt:
             </text>
@@ -2402,7 +2402,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2415,7 +2415,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2564,7 +2564,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Underpants:
             </text>
@@ -2605,7 +2605,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2618,7 +2618,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2767,7 +2767,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Skirt:
             </text>
@@ -2808,7 +2808,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2821,7 +2821,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2970,7 +2970,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Tattoo:
             </text>
@@ -3024,7 +3024,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3037,7 +3037,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -3186,7 +3186,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Alpha:
             </text>
@@ -3305,7 +3305,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3318,7 +3318,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 990be55847..1f192f9b28 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -45,9 +45,9 @@
      layout="topleft"
      name="Reset"
      left="10"
-     width="61" />
+     width="85" />
     <check_box
-    left_delta="71"
+    left_delta="90"
     top_delta="3"
      enabled="false"
      follows="left|bottom"
@@ -57,9 +57,9 @@
      label="Running"
      layout="topleft"
      name="running"
-     width="100" />
+     width="205" />
     <check_box
-    left_delta="75"
+    left_delta="140"
      enabled="true"
      follows="left|bottom"
      font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 01548dd820..dda14f02ff 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -45,7 +45,7 @@
     </radio_group>
   <ui_ctrl 
     height="90"
-    width="90"
+    width="125"
     layout="topleft"
     name="thumbnail_placeholder"
     top_pad="6"
@@ -149,7 +149,7 @@
      left="10"
      name="type_label2"
      top_pad="5"
-     width="120">
+     width="127">
         Size
     </text>
     <text
@@ -199,7 +199,7 @@
      left_delta="0"
      name="texture_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -228,7 +228,7 @@
      left_delta="0"
      name="local_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index affe74d148..3b1ecb4c20 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -990,11 +990,11 @@
              label="For Sale:"
              layout="topleft"
              name="checkbox for sale"
-             left="10"
-             width="90" />
+             left="7"
+             width="93" />
 <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
-            left_pad="0"
+            left_pad="3"
             layout="topleft"
             follows="left|top"
             allow_text_entry="false"
@@ -1104,9 +1104,9 @@ even though the user gets a free copy.
              follows="left|top|right"
              label="Modify"
              layout="topleft"
-             left="15"
+             left="5"
              name="checkbox next owner can modify"
-             width="85" />
+             width="80" />
             <check_box
              follows="left|top|right"
              height="19"
@@ -1114,7 +1114,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="0"
              name="checkbox next owner can copy"
-             width="90" />
+             width="80" />
             <check_box
              follows="left|top|right"
              height="19"
@@ -1124,7 +1124,7 @@ even though the user gets a free copy.
              left_pad="0"
              top_delta="0"
              tool_tip="Next owner can give away or resell this object"
-             width="90" />
+             width="100" />
             <text
              type="string"
              text_color="EmphasisColor"
@@ -2051,7 +2051,7 @@ even though the user gets a free copy.
              increment="1"
              initial_value="2"
              label="Softness"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="3"
@@ -2064,7 +2064,7 @@ even though the user gets a free copy.
              increment="0.5"
              initial_value="0.3"
              label="Gravity"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2078,7 +2078,7 @@ even though the user gets a free copy.
              increment="0.5"
              initial_value="2"
              label="Drag"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2091,7 +2091,7 @@ even though the user gets a free copy.
              increment="0.5"
              initial_value="0"
              label="Wind"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2104,7 +2104,7 @@ even though the user gets a free copy.
              increment="0.5"
              initial_value="1"
              label="Tension"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2117,7 +2117,7 @@ even though the user gets a free copy.
              increment="0.01"
              initial_value="0"
              label="Force X"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2131,7 +2131,7 @@ even though the user gets a free copy.
              increment="0.01"
              initial_value="0"
              label="Force Y"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
@@ -2145,7 +2145,7 @@ even though the user gets a free copy.
              increment="0.01"
              initial_value="0"
              label="Force Z"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="10"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 7b6081d7be..85853f39bb 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -156,18 +156,19 @@
                    name="notify_container"
                    tab_group="-2"
                    width="1024"/>
-  <menu_holder top="0"
-               follows="all"
-               height="768"
-               mouse_opaque="false"
-               name="Menu Holder"
-               width="1024"/>
   <panel top="0"
          follows="all"
          height="768"
          mouse_opaque="false"
          name="popup_holder"
+         class="popup_holder"
          width="1024"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
   <snapshot_floater_view enabled="false"
                          follows="all"
                          height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 48083b7677..15a3191bdf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -86,7 +86,7 @@
      left="4"
      name="ok_button"
      top="356"
-     width="130" />
+     width="135" />
     <button
      height="20"
      label="Cancel"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f20526b491..c74de043e9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -635,7 +635,7 @@
         left_delta="-230"
         name="LightingDetailText"
         top_pad="8"
-        width="128">
+        width="140">
            Lighting detail:
         </text>
         <radio_group
@@ -672,10 +672,10 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="360"
+        left="358"
         name="TerrainDetailText"
         top="465"
-        width="128">
+        width="155">
            Terrain detail:
         </text>
         <radio_group
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 3913b6d709..c5b2512fba 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -20,7 +20,7 @@
      name="estate_help_text"
      top="14"
      word_wrap="true"
-     width="275">
+     width="250">
         Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index d14355b9f4..d444420550 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -178,5 +178,5 @@
      top_pad="-35"
      right="487"
      name="Save_btn"
-     width="61" />
+     width="81" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 8a1f74c46c..0c870e155b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -51,7 +51,7 @@
      image_unselected="spacer35.tga"
      image_pressed="spacer35.tga"
      height="16"
-     right="-220"
+     right="-230"
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 86739b24c8..433b7691fa 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -77,7 +77,7 @@
      top="0"
      use_ellipses="true"
      value="Object Profile"
-     width="275" />
+     width="290" />
 	    <text
      follows="top|left"
      height="13"