Automated merge up from viewer-development into mesh-development

5 files changed, 30 insertions, 30 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index d5d4565ca1..ab81a86720 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -204,7 +204,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_name_text"
      top_delta="0"
      use_ellipses="true"
@@ -237,7 +237,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_type_text"
      top_delta="0"
      width="175">
@@ -262,7 +262,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_name_text"
      top_delta="0"
      width="175">
@@ -276,8 +276,8 @@ supports [AMOUNT2] objects
      layout="topleft"
      left="440"
      name="estate_owner_label"
-     right="550"
-     width="100"
+     right="565"
+     width="120"
      word_wrap="true">
         Estate Owner:
     </text>
@@ -287,7 +287,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_owner_text"
      top_delta="0"
      width="175">
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 619669d28a..38b305db7e 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -41,14 +41,14 @@
      follows="top|left"
      left="16"
      name="info_parcel_label"
-     width="48">
+     width="70">
         Parcel:
     </text>
     <text
      top_delta="0"
      follows="top|left"
      height="16"
-     left="56"
+     left="78"
      name="info_parcel"
      right="-20">
         PARCEL NAME
@@ -57,14 +57,14 @@
      follows="top|left"
      left="16"
      name="info_size_label"
-     width="48">
+     width="70">
         Size:
     </text>
     <text
      follows="top|left"
      top_delta="0"
      height="32"
-     left="56"
+     left="78"
      name="info_size"
      right="-20">
         [AREA] m²
@@ -164,14 +164,14 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="170" />
+     width="150" />
     <button
      height="20"
      label="Select"
      left_pad="5"
      name="sell_to_select_agent"
      top_delta="0"
-     width="60" />
+     width="90" />
     <text
      follows="top|left"
      font="SansSerif"
@@ -199,20 +199,20 @@
         <radio_item
          bottom="40"
          height="0"
-         left="10"
+         left="2"
          name="none"
          visible="false" />
         <radio_item
          top_pad="10"
-         height="16"
+         height="18"
          label="No, keep ownership of objects"
-         left="10"
+         left="2"
          name="no" />
         <radio_item
          top_pad="10"
          height="16"
          label="Yes, sell objects with land"
-         left="10"
+         left="2"
          name="yes" />
     </radio_group>
     <button
@@ -221,7 +221,7 @@
      name="show_objects"
      left="70"
      top_pad="10"
-     width="110" />
+     width="140" />
     <text
      bottom_delta="30"
      follows="top|left"
@@ -229,7 +229,7 @@
      height="16"
      left="16"
      name="nag_message_label"
-     right="-20">
+     right="-5">
         REMEMBER: All sales are final.
     </text>
     <button
@@ -239,15 +239,15 @@
      left_delta="0"
      name="sell_btn"
      top_pad="10"
-     width="130" />
+     width="185" />
     <button
      follows="bottom|left"
      height="20"
      label="Cancel"
-     left_pad="30"
+     left_pad="5"
      name="cancel_btn"
      top_delta="0"
-     width="90" />
+     width="85" />
     </panel>
     </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e413228ddc..ec190ab656 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -100,7 +100,7 @@
      right="-5"
      name="upload_btn"
      top_delta="0"
-     width="100" />
+     width="110" />
     <flyout_button
      follows="left|top"
      height="23"
@@ -147,7 +147,7 @@
      right="-5"
      left_pad="5"
      name="discard_btn"
-     width="100" />
+     width="110" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index b06c6dc215..4dfdcd15c7 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -105,7 +105,7 @@
      left_delta="0"
      name="id_text"
      top_pad="10"
-     width="100">
+     width="107">
         Object ID:
     </text>
     <line_editor
@@ -116,7 +116,7 @@
      left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -138,7 +138,7 @@
      left="10"
      top_pad="5"
      name="obj_name_text"
-     width="100">
+     width="107">
         Object name:
     </text>
     <line_editor
@@ -148,7 +148,7 @@
      left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -170,7 +170,7 @@
      left="10"
      top_pad="5"
      name="owner_name_text"
-     width="100">
+     width="107">
         Owner:
     </text>
     <line_editor
@@ -180,7 +180,7 @@
      left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 38e8b9844f..cdf14572fe 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -196,7 +196,7 @@
    initial_val="256" 
    label="" 
    label_width="0"
-   left_delta="40" 
+   left_delta="68" 
    max_val="2048" 
    min_val="0" 
    mouse_opaque="true"