From 9c8416b34ea6cc89c330b0607552a2d79a409468 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 12:33:32 -0800
Subject: VWR-17615 en_xui_change; undoing bad local overrides in fr and es

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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
-- 
cgit v1.2.3


From 5123e1c557a770311919dd3c833bdeb58113a735 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 15:18:55 -0800
Subject: EXT-6266 en_xui_change for spinner label widths; undid 'de' local
 overrides

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index affe74d148..948dbd84e4 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -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"
-- 
cgit v1.2.3


From 4313ace418d10f9ef94082dbae99337e86939f6f Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 16:08:43 -0800
Subject: WR-17933 en_xui_change; undid 'de' evil overrides. also, more fix for
 'en' floater_tools build menu

---
 indra/newview/skins/default/xui/en/floater_tools.xml      | 2 +-
 indra/newview/skins/default/xui/en/panel_group_invite.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 948dbd84e4..18c9911012 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1104,7 +1104,7 @@ 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" />
             <check_box
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"
-- 
cgit v1.2.3


From 29e08b9c3fd6fade7f625c487d28a86569713240 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 16:43:26 -0800
Subject: VWR-17477 en_xui_change

---
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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"
-- 
cgit v1.2.3


From b51515100c75b737c144834d8efd594c3fe9ae69 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Mar 2010 12:16:44 -0800
Subject: rolled back changeset 5fbab7aa32ef to fix EXT-6269

---
 .../skins/default/xui/en/panel_region_general.xml  | 45 ++++++----------------
 1 file changed, 12 insertions(+), 33 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 4acfa42c23..1bbe9d80c0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,48 +171,27 @@
      width="100">
         Rating:
     </text>
-    <icons_combo_box
-     follows="left|top"
+    <combo_box
      height="20"
      label="Moderate"
      layout="topleft"
      left_delta="100"
      name="access_combo"
      top_delta="0"
-     width="105">
-        <icons_combo_box.drop_down_button
-         image_overlay="Parcel_M_Light"
-         image_overlay_alignment="left"
-         imgoverlay_label_space="3"
-         pad_left="3"/>
-        <icons_combo_box.item
+     width="85">
+        <combo_box.item
          label="Adult"
-         value="42">
-            <item.columns
-             halign="center"
-             type="icon"
-             value="Parcel_R_Light"
-             width="20"/>
-          </icons_combo_box.item>
-        <icons_combo_box.item
+         name="Adult"
+         value="42" />
+        <combo_box.item
          label="Moderate"
-         value="21">
-            <item.columns
-             halign="center"
-             type="icon"
-             value="Parcel_M_Light"
-             width="20"/>
-        </icons_combo_box.item>
-        <icons_combo_box.item
+         name="Mature"
+         value="21" />
+        <combo_box.item
          label="General"
-         value="13">
-            <item.columns
-             halign="center"
-             type="icon"
-             value="Parcel_PG_Light"
-             width="20"/>
-        </icons_combo_box.item>
-    </icons_combo_box>
+         name="PG"
+         value="13" />
+    </combo_box>
     <button
      enabled="false"
      follows="left|top"
-- 
cgit v1.2.3


From 9561131501f6c4698f9a1afdc790d2646320cae3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 9 Mar 2010 16:29:52 +0200
Subject: Fixed major bug EXT-5939 (UI slider tracks turn light grey when in
 focus) - All horizontal sliders are configured to have no highlighted track.

---
 indra/newview/skins/default/xui/en/widgets/slider_bar.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 89d5950e98..ea63cac790 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. -->
 <slider_bar track_color="SliderTrackColor"
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
@@ -7,6 +8,6 @@
             thumb_image_disabled="SliderThumb_Disabled"
             track_image_horizontal="SliderTrack_Horiz"
             track_image_vertical="SliderTrack_Vert"
-            track_highlight_horizontal_image="SliderTrack_Horiz"
+            track_highlight_horizontal_image="transparent.j2c"
             track_highlight_vertical_image="SliderTrack_Vert"
          font="SansSerif"  />
-- 
cgit v1.2.3


From e4ea6780611fb6c1ed030940278bb839db6bc27d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 18:11:23 -0800
Subject: VWR-17484 en_xui_change; undid old 'da' overrides to fix truncation

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 18c9911012..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"
@@ -1106,7 +1106,7 @@ even though the user gets a free copy.
              layout="topleft"
              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"
-- 
cgit v1.2.3


From 8971ba6417999d2eb8f7a6487a43c569b55dcac8 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 8 Mar 2010 18:24:42 -0800
Subject: VWR-17496 en_xui_change; undid bad hardcoded 'ja' width override.

---
 indra/newview/skins/default/xui/en/panel_region_estate.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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
-- 
cgit v1.2.3


From aa65ce52bed7a161127f9f93330079d410ebbb94 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Sat, 6 Mar 2010 01:16:56 +0200
Subject: Fixed major bug (EXT-6033) Parcel, Region,and Estate areas of
 'PlaceProfile' are corrupted. - Added height attribute value to accordion
 tabs.

---
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 01a27a08c7..1e7c51259c 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -325,6 +325,7 @@
              top_pad="10"
              width="313">
                 <accordion_tab
+                 height="170"
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
@@ -537,6 +538,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="150"
                  layout="topleft"
                  name="region_information_tab"
                  title="Region">
@@ -664,6 +666,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="190"
                  layout="topleft"
                  name="estate_information_tab"
                  title="Estate">
@@ -753,6 +756,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="320"
                  layout="topleft"
                  name="sales_tab"
                  title="For Sale">
-- 
cgit v1.2.3


From 1e5fe95b1d2d4912a3c9d84e2c32ff141f0dc4d9 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 10 Mar 2010 18:20:18 -0800
Subject: EXT-6295 - Cannot log in with new account, TOS dialog does not load

reviewed by Mani
---
 indra/newview/skins/default/xui/en/main_view.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 85853f39bb..1ace760816 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -143,12 +143,19 @@
   <panel mouse_opaque="false"
          follows="left|right|top"
          name="status_bar_container"
-                tab_stop="false"
+         tab_stop="false"
          height="19"
          left="0" 
          top="0" 
          width="1024"
          visible="false"/>
+  <view mouse_opaque="false"
+        follows="all"
+        name="menu_bar_holder"
+        left="0"
+        top="0"
+        width="1024"
+        height="768"/>
   <notify_box_view top="0"
                    follows="all"
                    height="768"
@@ -156,6 +163,15 @@
                    name="notify_container"
                    tab_group="-2"
                    width="1024"/>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="true"
+         name="progress_view"
+         filename="panel_progress.xml" 
+         class="progress_view"
+         width="1024"
+         visible="false"/>
   <panel top="0"
          follows="all"
          height="768"
-- 
cgit v1.2.3


From adbaf087b5a70b3549ec9ed3ec07cc1fd2f1f1a6 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 9 Mar 2010 18:00:59 -0800
Subject: VWR-17514 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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 3297150c7f..4a81aea7ce 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1107,7 +1107,7 @@ Leyla Linden               </text>
                  label="Type"
                  name="type"
                  sort_column="online_status"
-                 width="24" />
+                 width="50" />
                 <name_list.columns
                  name="online_status"
                  width="-1" />
-- 
cgit v1.2.3


From 34b098058107e81c3082150f259ee8f80cc72cfa Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 9 Mar 2010 18:22:29 -0800
Subject: VWR-17485 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3b1ecb4c20..12d169b70a 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -290,11 +290,11 @@
      width="134" />
    <check_box
      control_name="SnapEnabled"
-     height="20"
+     height="18"
      initial_value="true"
      label="Snap to grid"
      layout="topleft"
-     top_pad="0"
+     top_pad="7"
      name="checkbox snap to grid"
      width="134" />
     <combo_box
-- 
cgit v1.2.3


From 2add76cd17a49ce0f36466fc7437cec8bac9c3e6 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 9 Mar 2010 18:30:04 -0800
Subject: VWR-18034 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_edit_classified.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_edit_pick.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index c1b352031f..2d220327af 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -186,7 +186,7 @@
          left="10"
          top_pad="5"
          name="set_to_curr_location_btn"
-         width="156" />
+         width="200" />
         <text
          follows="left|top"
          font.style="BOLD"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 657e369beb..7445bb339d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -164,7 +164,7 @@
          left="8"
          top_pad="0"
          name="set_to_curr_location_btn"
-         width="156" />
+         width="200" />
     </panel>
     </scroll_container>
     <panel
-- 
cgit v1.2.3


From 4e5a7d69124e7a338bcd799748e9f0a5f716ceaa Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 10 Mar 2010 11:58:04 -0800
Subject: VWR-18046 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_event.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index bcf15d7193..0255e202fb 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -228,7 +228,7 @@
        name="rating_label"
        top_delta="3"
        value="Rating:"
-       width="58" />
+       width="90" />
       <text
        follows="left|right|top"
        height="16"
-- 
cgit v1.2.3


From c5b0a9480871a93e258849ba2d806d55fcff1203 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 11 Mar 2010 14:18:35 -0800
Subject: VWR-18253 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 1e7c51259c..9e5ef10d42 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -353,7 +353,7 @@
                          left_pad="12"
                          name="rating_label"
                          value="Rating:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="16"
@@ -380,7 +380,7 @@
                          name="voice_label"
                          top_delta="0"
                          value="Voice:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="18"
@@ -406,7 +406,7 @@
                          left_pad="8"
                          name="fly_label"
                          value="Fly:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="16"
@@ -432,7 +432,7 @@
                          left_pad="8"
                          name="push_label"
                          value="Push:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
@@ -458,7 +458,7 @@
                          left_pad="8"
                          name="build_label"
                          value="Build:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="15"
@@ -484,7 +484,7 @@
                          left_pad="8"
                          name="scripts_label"
                          value="Scripts:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
@@ -510,7 +510,7 @@
                          left_pad="8"
                          name="damage_label"
                          value="Damage:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
-- 
cgit v1.2.3


From 85e55e8de15dd19814437b5170b11ad390eb5813 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 11 Mar 2010 15:18:02 -0800
Subject: VWR-18254 en_xui_change

---
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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 433b7691fa..d46783e058 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -303,7 +303,7 @@
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="200">
+             width="310">
                 You can modify this object
             </text>
 	  	    <text
-- 
cgit v1.2.3


From da3d0b104ac48ba0d5bcc0bc7b5b2561bae911b3 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 12 Mar 2010 16:18:56 +0200
Subject: Fixed reopened normal sub-task EXT-5950 (Do not spawn IM chiclet for
 "drop on avatar" inventory offers).

- Added logging of "Inventory item offered" message when dnd'ing item on avatar via new LLToolDragAndDrop::logInventoryOffer() method.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 59c54f0cad..e1f5dd93d4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2902,6 +2902,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_default_text_label">Click here to instant message.</string>
 	<string name="IM_to_label">To</string>
 	<string name="IM_moderator_label">(Moderator)</string>
+  <string name="inventory_item_offered">Inventory item offered</string>
 
 	<!-- voice calls -->
 	<string name="started_call">Started a voice call</string>
-- 
cgit v1.2.3


From ae320d38cd95b3f4467c54109efe14a43d8b0739 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 16 Mar 2010 13:32:18 -0700
Subject: en_xui_change to fix ES truncation; ES linguistic fix (removing
 ellipsis in many labels to match EN)

---
 .../newview/skins/default/xui/en/floater_about_land.xml  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 2764befeac..33977e9f1a 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -275,7 +275,7 @@ Leyla Linden               </text>
              left_pad="4"
              right="-10"
              name="Set..."
-             width="50"
+             width="90"
              top_delta="-2"/>
             <check_box
              enabled="false"
@@ -407,7 +407,7 @@ Leyla Linden               </text>
              name="Cancel Land Sale"
              left_pad="5"
              top_pad="-25"
-             width="155" />
+             width="180" />
             <text
              type="string"
              length="1"
@@ -486,10 +486,10 @@ Leyla Linden               </text>
              height="23"
              label="Buy Land"
              layout="topleft"
-             left_delta="82"
+             left_delta="52"
              name="Buy Land..."
              top_pad="7"
-             width="100" />
+             width="130" />
             <button
              enabled="true"
              follows="left|top"
@@ -499,7 +499,7 @@ Leyla Linden               </text>
              left="10"
              name="Scripts..."
              top_pad="1"
-             width="100" />
+             width="150" />
             <button
              enabled="false"
              follows="left|top"
@@ -516,11 +516,11 @@ Leyla Linden               </text>
              height="23"
              label="Buy Pass"
              layout="topleft"
-             left_delta="-105"
+             left_delta="-135"
              name="Buy Pass..."
              tool_tip="A pass gives you temporary access to this land."
              top_delta="0"
-             width="100" />
+             width="130" />
             <button
              follows="left|top"
              height="23"
@@ -1056,7 +1056,7 @@ Leyla Linden               </text>
              left="10"
              name="Autoreturn"
              top_pad="0"
-             width="294">
+             width="310">
                 Auto return other Residents&apos; objects (minutes, 0 for off):
             </text>
             <line_editor
-- 
cgit v1.2.3


From a5c43859c355afbb5a24d8599756297cad07f590 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 16 Mar 2010 17:11:02 -0400
Subject: EXT-5735 : InventorySP doesn't show # of inventory items even when
 known by viewer

Moved # items fetched string into panel_main_inventory (out of floater_inventory) so that it's shared by all inventory views.
---
 .../skins/default/xui/en/floater_inventory.xml     | 16 ------
 .../skins/default/xui/en/panel_main_inventory.xml  | 63 +++++++++++++++-------
 2 files changed, 44 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 0d381fe5cb..ba2e0d3277 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -14,22 +14,6 @@
  single_instance="false"
  title="MY INVENTORY"
  width="467">
-    <floater.string
-     name="Title">
-        MY INVENTORY
-    </floater.string>
-    <floater.string
-     name="TitleFetching">
-        MY INVENTORY (Fetching [ITEM_COUNT] Items...) [FILTER]
-    </floater.string>
-    <floater.string
-     name="TitleCompleted">
-        MY INVENTORY ([ITEM_COUNT] Items) [FILTER]
-    </floater.string>
-    <floater.string
-     name="Fetched">
-        Fetched
-    </floater.string>
     <panel
      bottom="560"
 	 class="panel_main_inventory"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 50983d2976..c7768c6eb6 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -10,9 +10,34 @@
  name="main inventory panel"
  width="330">
     <panel.string
-     name="Title">
-        Things
+     name="Itemcount">
     </panel.string>
+    <panel.string
+     name="ItemcountFetching">
+        Fetching [ITEM_COUNT] Items... [FILTER]
+    </panel.string>
+    <panel.string
+     name="ItemcountCompleted">
+        [ITEM_COUNT] Items [FILTER]
+    </panel.string>
+    <panel.string
+     name="ItemcountUnknown">
+
+    </panel.string>
+	<text
+		     type="string"
+		     length="1"
+		     follows="left|top"
+		     height="13"
+		     layout="topleft"
+    		 left="12"
+		     name="ItemcountText"
+		     font="SansSerifMedium"
+		     text_color="EmphasisColor"
+		     top_pad="0"
+		     width="300">
+	        Items:
+    </text>
     <menu_bar
      bg_visible="false"
      follows="left|top|right"
@@ -21,8 +46,8 @@
      left="10"
      mouse_opaque="false"
      name="Inventory Menu"
-     top="0"
-	   visible="true"
+     top="+10"
+	 visible="true"
      width="290">
         <menu
          height="101"
@@ -377,30 +402,30 @@
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
-	height="23"
+	 height="23"
      label="Filter Inventory"
      layout="topleft"
      left="10"
-max_length="300"
+     max_length="300"
      name="inventory search editor"
-     top="26"
+     top="+31"
      width="303" />
     <tab_container
-            bg_opaque_color="DkGray2"
+       bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
        background_visible="true"
        background_opaque="true"
-follows="all"
-halign="center"
-     height="305"
-     layout="topleft"
-     left="6"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="10"
-     width="315">
+       follows="all"
+       halign="center"
+       height="300"
+       layout="topleft"
+       left="6"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top_pad="10"
+       width="315">
         <inventory_panel
             bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From a5639f1dd5ceb130fe29811ade41fb1bc95202b9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 16 Mar 2010 14:13:12 -0700
Subject: en_xui_change for ES truncation in 'floater animation preview';
 undoing ES parameter overrides

---
 .../default/xui/en/floater_animation_preview.xml   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 1ffedde29b..9dff4abe2c 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -218,14 +218,14 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="1"
      initial_value="0"
      label="In(%)"
-     label_width="49"
+     label_width="70"
      layout="topleft"
      top_pad="5"
-     left="30"
+     left="15"
      max_val="100"
      name="loop_in_point"
      tool_tip="Sets point in animation that looping returns to"
-     width="115" />
+     width="130" />
     <spinner
      bottom_delta="0"
      follows="left|top"
@@ -238,8 +238,8 @@ Maximum animation length is [MAX_LENGTH] seconds.
      max_val="100"
      name="loop_out_point"
      tool_tip="Sets point in animation that ends a loop"
-     label_width="49"
-     width="115" />
+     label_width="60"
+     width="120" />
     <text
      type="string"
      length="1"
@@ -256,10 +256,10 @@ Maximum animation length is [MAX_LENGTH] seconds.
     <combo_box
      height="23"
      layout="topleft"
-     left_pad="0"
+     left_pad="20"
      name="hand_pose_combo"
      tool_tip="Controls what hands do during animation"
-     width="150">
+     width="130">
         <combo_box.item
          label="Spread"
          name="Spread"
@@ -328,9 +328,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
     </text>
     <combo_box
      height="23"
-     width="150"
+     width="130"
      layout="topleft"
-     left_pad="0"
+     left_pad="20"
      name="emote_combo"
      tool_tip="Controls what face does during animation">
         <combo_box.item
@@ -409,9 +409,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
     </text>
     <combo_box
      height="23"
-     width="150"
+     width="130"
      layout="topleft"
-     left_pad="0"
+     left_pad="20"
      name="preview_base_anim"
      tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
         <combo_box.item
@@ -433,27 +433,27 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="0.01"
      initial_value="0"
      label="Ease In (sec)"
-     label_width="110"
+     label_width="140"
      layout="topleft"
      left="10"
      max_val="10"
      name="ease_in_time"
      tool_tip="Amount of time (in seconds) over which animations blends in"
      top_pad="10"
-     width="200" />
+     width="210" />
     <spinner
      follows="left|top"
      height="23"
      increment="0.01"
      initial_value="0"
      label="Ease Out (sec)"
-     label_width="110"
+     label_width="140"
      layout="topleft"
      top_pad="0"
      max_val="10"
      name="ease_out_time"
      tool_tip="Amount of time (in seconds) over which animations blends out"
-     width="200" />
+     width="210" />
     <button
      follows="top|right"
      height="23"
-- 
cgit v1.2.3


From 24d95dc0ba3a1fc642484192d79d92bcaa6dfdd9 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 17 Mar 2010 10:57:45 +0200
Subject: Fixed normal task EXT-6021 	[HARD CODED] Bubble shown when you
 mouseover on script within Contents is in EN (task inventory) * Added new
 string name="PanelContentsTooltip into strings.xml * Set this tooltip to
 LLFolderView inside the Build Tool

Note: Fix for localization of default "New Script" name will be fixed in the EXT-5839.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/43/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 111daec242..707a830622 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2121,6 +2121,7 @@ Clears (deletes) the media and all params from the given face.
 
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
+	<string name="PanelContentsTooltip">Content of object</string>
 
   <!-- panel preferences general -->
   <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
-- 
cgit v1.2.3


From 8bf0509959e5f8ff7d8628d02f9193c8609b2f31 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 17 Mar 2010 13:22:29 +0200
Subject: fixed EXT-6350 [HARD CODED] - System message when loosing
 connectivity needs to be localized

extracted strings used in LLAppViewer::forceDisconnect(...) calls

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/41/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 707a830622..da39f13726 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -56,7 +56,9 @@
 	<string name="SavingSettings">Saving your settings...</string>
 	<string name="LoggingOut">Logging out...</string>
 	<string name="ShuttingDown">Shutting down...</string>
-
+	<string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
+	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
+	<string name="TestingDisconnect">Testing viewer disconnect</string>
 
 	<!-- Tooltip, lltooltipview.cpp -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
-- 
cgit v1.2.3


From 5cae8140f4dfbdd9c4b3237a0d47248753180913 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 17 Mar 2010 13:25:18 +0200
Subject: fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert:
 "MiddleMouse" needs to be localized)

Control value is preserved, it is being localized on presentation

Reviewed by Richard at https://codereview.productengine.com/secondlife/r/24/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 4be4d6b432..c658e0de6f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -12,6 +12,10 @@
 	<panel.string
      name="aspect_ratio_text">
         [NUM]:[DEN]
+    </panel.string>
+    <panel.string
+     name="middle_mouse">
+        Middle Mouse
     </panel.string>
          <icon
 	 follows="left|top"
-- 
cgit v1.2.3


From 464092e2c9354c62143f3cbf5503445e6e6fe84e Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Mar 2010 14:17:35 +0200
Subject: Fixed normal EXT - 6028 ( [HARD CODED]? Inventory > Library >
 \"Accessories\" folder)

Added localization string to the strings.xml for Accessories folder and localization support of Accessories folder from source code (llfolderviewitem.cpp).
<string name=\"InvFolder Accessories\">TRANSLATION TO THE CORRESPONDING LANGUAGE</string>  -- this string should be added to the strings.xml for each locale.

Note: due to Accessories category is created out of viewer & has the FT_NONE type it can not be localized as other protected (system) categories.
 So, hack was provided to check this folder (in a Library) & localize it.

Reviewd by Mike Antipov at https://codereview.productengine.com/secondlife/r/42/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index da39f13726..eb45a9765b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1894,6 +1894,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="InvFolder favorite">Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
+	<string name="InvFolder Accessories">Accessories</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
-- 
cgit v1.2.3


From 69491cccae0ec7a638abcee34f460aed314997ef Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Mar 2010 14:40:50 +0200
Subject: Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My
 Appearance > Wearing tab - where it's linked description)

- Replaced hardcoded '(active)' string with [GESLABEL] arg. <string name=\"ActiveGesture\" value=\"[GESLABEL] (TRANSLATION OF 'active')\"/> - this line with translation should be added to the rest locales

- Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index eb45a9765b..a8f888f0cb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1838,6 +1838,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
+	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
 	<!-- Inventory permissions -->
 	<string name="PermYes">Yes</string>
 	<string name="PermNo">No</string>
-- 
cgit v1.2.3


From 962521ec19a1fce7946b7897c2bb57b4fbab030a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 17 Mar 2010 15:25:53 +0200
Subject: Fixed normal task EXT-6403 [TRUNCATION] [EN XUI REDESIGN] - Menu
 Einstellungen, Tab Sound & Medien: Stummschalten, wenn minimiert is truncated
 * Increased floater width from 620 to 658 px to accommodate it to checkbox
 label width. * Updated "Busy mode response" (on General tab) texteditor and
 "Always show" & "Never show" lists (on Notifications tab) to be looks better
 on a wider width. * Content of other panels was not redesigned.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_preferences.xml       | 4 ++--
 indra/newview/skins/default/xui/en/panel_preferences_alerts.xml  | 8 ++++----
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d7a7daf30c..b5a3764e73 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -10,7 +10,7 @@
  help_topic="preferences"
  single_instance="true"
  title="PREFERENCES"
- width="620">
+ width="658">
     <button
      follows="right|bottom"
      height="23"
@@ -48,7 +48,7 @@
      tab_width="115"
      tab_padding_right="5"
      top="21"
-     width="620">
+     width="658">
         <panel
 	 class="panel_preference"
          filename="panel_preferences_general.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 188fd3b7bc..516457dd93 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -51,13 +51,13 @@
         Always show:
     </text>
     <scroll_list
-     follows="top|left"
+     follows="top|left|right"
      height="140"
      layout="topleft"
      left="10"
      multi_select="true"
      name="enabled_popups"
-     width="475" />
+     width="495" />
 	 <button
 	 enabled_control="FirstSelectedDisabledPopups"
      follows="top|left"
@@ -99,11 +99,11 @@
         Never show:
     </text>
     <scroll_list
-     follows="top|left"
+     follows="top|left|right"
      height="140"
      layout="topleft"
      left="10"
      multi_select="true"
      name="disabled_popups"
-     width="475" />
+     width="495" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index d11aebe943..e667fa9a2b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -365,12 +365,12 @@
       use_ellipses="false"
       hover="false"
      commit_on_focus_lost = "true"
-     follows="left|top"
+     follows="left|top|right"
      height="60"
      layout="topleft"
      left="50"
      name="busy_response"
-     width="440"
+     width="450"
      word_wrap="true">
        log_in_to_change
     </text_editor>
-- 
cgit v1.2.3


From 4a1857886b5742fb89bbcc1a90bf507ad9dabec5 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 17 Mar 2010 15:57:36 +0200
Subject: fixed EXT-6303 [TRUNCATION] Side bar: People > Recent - Time. Need
 xui designer to adjust width.

increased width of the "last interaction" text editor to accomodate two japanese hieroglyphs
when 2 digit number is shown

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/47/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 1e2e74f882..876ff9961b 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -69,7 +69,7 @@
      name="last_interaction"
      text_color="LtGray_50"
      value="0s"
-     width="24" />
+     width="35" />
     <button
      follows="right"
      height="16"
-- 
cgit v1.2.3


From 31370e1aaea10543be81d1707c28dc4c2559baac Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 17 Mar 2010 16:27:35 +0200
Subject: =?UTF-8?q?fixed=20EXT-6373=20=E2=80=9CConsecutive=20offer=20messa?=
 =?UTF-8?q?ges=20are=20unreadable=20in=20the=20IM=20log=E2=80=9D,=20added?=
 =?UTF-8?q?=20spacer=20panel=20for=20IM=20chat=20plaintext=20mode;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/chat_history.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index ef885e8045..aa3ea736b8 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -2,6 +2,7 @@
 <chat_history
   message_header="panel_chat_header.xml"
   message_separator="panel_chat_separator.xml"
+  message_plaintext_separator="panel_chat_plaintext_separator.xml"
   left_text_pad="10"
   right_text_pad="15"
   left_widget_pad="0"
-- 
cgit v1.2.3


From 787036881a5d91bf3eec8aa43ac5c08853ca211a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 17 Mar 2010 16:49:23 +0200
Subject: Completed normal task EXT-6266 ([EN XUI REWORK] in build menu tab
 titles -- need 'en' xui xml designer rework for multiple languages) *
 Increased max width of tabs from 54 to 100 px to accommodate all tabs'
 labels.

Note: scroll arrows appear for all locales. Full redesign is required for the Build floater

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/48/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 12d169b70a..2235b84869 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -741,7 +741,7 @@
      halign="center"
      left="0"
      name="Object Info Tabs"
-     tab_max_width="54"
+     tab_max_width="100"
      tab_min_width="40"
      tab_position="top"
      tab_height="25"
-- 
cgit v1.2.3


From 509457b8ef7bfb8e5b6dcb1a25996ae8fe329007 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 17 Mar 2010 15:13:08 +0000
Subject: EXT-6335: Add custom labels for specific agent SLapp commands.

We now display custom labels and tooltips for the various
secondlife:///app/agent SLapp suffixes that we support. These include:
/mute, /unmute, /pay, /im, /offerteleport, and /requestfriend. For
example, entering:

secondlife:///app/agent/3e2d81e8-6269-8100-860e-c64e5cee3c2c/mute

Now displays the SLapp in text chat as "Mute <Name>", rather than
simply "<Name>".
---
 indra/newview/skins/default/xui/en/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 111daec242..2a46311fce 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -79,6 +79,12 @@
 	<string name="TooltipHttpUrl">Click to view this web page</string>
 	<string name="TooltipSLURL">Click to view this location's information</string>
 	<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
+	<string name="TooltipAgentMute">Click to mute this Resident</string>
+	<string name="TooltipAgentUnmute">Click to unmute this Resident</string>
+	<string name="TooltipAgentIM">Click to IM this Resident</string>
+	<string name="TooltipAgentPay">Click to Pay this Resident</string>
+	<string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string>
+	<string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</string>
 	<string name="TooltipGroupUrl">Click to view this group's description</string>
 	<string name="TooltipEventUrl">Click to view this event's description</string>
 	<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -95,6 +101,14 @@
 	<string name="SLurlLabelTeleport">Teleport to</string>
 	<string name="SLurlLabelShowOnMap">Show Map for</string>
 
+	<!-- label strings for secondlife:///app/agent SLapps -->
+	<string name="SLappAgentMute">Mute</string>
+	<string name="SLappAgentUnmute">Unmute</string>
+	<string name="SLappAgentIM">IM</string>
+	<string name="SLappAgentPay">Pay</string>
+	<string name="SLappAgentOfferTeleport">Offer Teleport to </string>
+	<string name="SLappAgentRequestFriend">Friend Request </string>
+
 	<!-- ButtonToolTips, llfloater.cpp -->
 	<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
 	<string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string>
-- 
cgit v1.2.3


From 6a871271ca17b5a272d66b6468259745de1ee263 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 18 Mar 2010 00:10:18 +0200
Subject: Partial fix for EXT-5986 ([HARD CODED]. "You paid ...... L$... " -
 message needs translation) - only changes to strings.xml are commited to make
 sure they make their way to localization. Code changes are to follow.
 Discussed at https://codereview.productengine.com/secondlife/r/55/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a8f888f0cb..cecdcb6dfd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3036,6 +3036,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
+  <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string>
+  <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
+  <string name="for a parcel of land">for a parcel of land</string>
+  <string name="for a land access pass">for a land access pass</string>
+  <string name="for deeding land">for deeding land</strin1g>
+  <string name="to create a group">to create a group</string>
+  <string name="to join a group">to join a group</string>
+  <string name="to upload">to upload</string>
+  
   <string name="giving">Giving</string>
   <string name="uploading_costs">Uploading costs</string>
   <string name="this_costs">This costs</string>
-- 
cgit v1.2.3


From 17421a30d4d5126933bf30005a6434937f69c329 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 18 Mar 2010 00:29:52 +0200
Subject: Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message
 needs translation)- removed unnecessary symbol in xml which was occasionally
 introduceded in 10453:cbac8ca300e0.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cecdcb6dfd..3a558f6878 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3041,7 +3041,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
   <string name="for a parcel of land">for a parcel of land</string>
   <string name="for a land access pass">for a land access pass</string>
-  <string name="for deeding land">for deeding land</strin1g>
+  <string name="for deeding land">for deeding land</string>
   <string name="to create a group">to create a group</string>
   <string name="to join a group">to join a group</string>
   <string name="to upload">to upload</string>
-- 
cgit v1.2.3


From 72fc80306b9146a545743027aa42f5e68e1c5063 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 17 Mar 2010 15:31:18 -0700
Subject: VWR-17383 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 8723e0a832..a2b15a2b87 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -142,14 +142,14 @@
    increment="1"
    initial_value="13000"
    label="Port number:"
-   label_width="75"
+   label_width="105"
    layout="topleft"
    left_delta="160"
    max_val="13050"
    min_val="13000"
    name="connection_port"
-   top_delta="-2"
-   width="140" />
+   top_delta="3"
+   width="170" />
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


From c92dd09653fd02af6339b6cb467e0922fd8dac2b Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 17 Mar 2010 17:58:07 -0700
Subject: VWR-18199 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2235b84869..43a221d0e1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -705,7 +705,7 @@
      left="135"
      name="button apply to selection"
      tool_tip="Modify selected land"
-     width="78">
+     width="82">
 	  <button.commit_callback
 	     function="BuildTool.applyToSelection"/>
     </button>
-- 
cgit v1.2.3


From d9c64d221353cf4bfc1fffa69f3fc083e76f3b4c Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 17 Mar 2010 18:19:31 -0700
Subject: fix for radio item not being selected after picking internal browser
 reviewed by Callum

---
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index a2b15a2b87..15f8b33f5b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -273,7 +273,7 @@
       layout="topleft"
       left="0"
       name="internal"
-      value="0"
+      value=""
       tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
       top="0"
       width="480" />
@@ -283,7 +283,7 @@
       layout="topleft"
       left_delta="0"
       name="external"
-      value="1"
+      value="true"
       tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
       top_delta="20"
       width="480" />
-- 
cgit v1.2.3


From d856f1ea9516f6d852dca56f16e08266747e3e96 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 18 Mar 2010 15:44:31 +0200
Subject: =?UTF-8?q?Low=20task=20(EXT-6261)=20[HARD=20CODED]=20Abuse=20Repo?=
 =?UTF-8?q?rt:=20After=20sending=20an=20abuse=20report,=20there=20is=20a?=
 =?UTF-8?q?=20popup=20window=20stating=20that=20the=20report=20is=20sent/u?=
 =?UTF-8?q?ploaded.=20The=20window=20isn=C2=B4t=20localized.=20-=20Removed?=
 =?UTF-8?q?=20hardcoded=20string.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c6d9e79267..d24873e9e6 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3070,4 +3070,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="group_role_officers">Officers</string>
   <string name="group_role_owners">Owners</string>
 
+  <string name="uploading_abuse_report">Uploading...
+  
+Abuse Report</string>
 </strings>
-- 
cgit v1.2.3


From bca2d21df6cc504bb090a81f231c90a8c544e063 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 18 Mar 2010 16:10:16 +0200
Subject: Updates for normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side
 panel, profiles: the teleport button is truncated. need 'en' xui designer
 rework) * 'en/panel_profile.xml' was redesigned. Assuming that 'de' locale
 doesn't have width overridden:  ** added ellipses to buttons' labels to get
 possibility found truncation easier (except for IM button)  ** reduced
 distance between buttons  ** reduced padding from left/right sides to 1 px

But there are still issue in two locales:
'es' for "add friend"
'pt' for "teleport"
These buttons can not be shown properly with default widths.

Note: 'de' & 'fr' locales have overridden width (not removed in the patch)

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/panel_profile.xml | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 412485e03f..9fcabc7722 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -311,12 +311,15 @@
          height="23"
          label="Add Friend"
          layout="topleft"
-         left="2"
+         left="1"
          mouse_opaque="false"
          name="add_friend"
+         pad_left="1" 
+         pad_right="1"
          tool_tip="Offer friendship to the Resident"
          top="5"
-         width="80" />
+         use_ellipses="true"
+         width="105" />
         <button
          follows="bottom|left"
          height="23"
@@ -325,8 +328,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="3"
-         width="39" />
+         left_pad="0"
+         width="19" />
         <button
          follows="bottom|left"
          height="23"
@@ -334,9 +337,12 @@
          layout="topleft"
          name="call"
          tool_tip="Call this Resident"
-         left_pad="3"
+         left_pad="0"
+         pad_left="1" 
+         pad_right="1"
          top="5"
-         width="43" />
+         use_ellipses="true"
+         width="48" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -344,10 +350,13 @@
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
+         pad_left="1" 
+         pad_right="1"
          tool_tip="Show the Resident on the map"
          top="5"
-         left_pad="3"
-         width="41" />
+         left_pad="0"
+         use_ellipses="true"
+         width="33" />
         <button
          follows="bottom|left"
          height="23"
@@ -355,9 +364,12 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="3"
+         left_pad="0"
+         pad_left="1" 
+         pad_right="1"
          top="5"
-         width="69" />
+         use_ellipses="true"
+         width="81" />
         <button
          follows="bottom|right"
          height="23"
@@ -367,7 +379,6 @@
          tool_tip="Pay money to or share inventory with the Resident"
          right="-1"
          top="5"
-	 	 left_pad="3"
          width="23" />
         </layout_panel>
       <layout_panel
-- 
cgit v1.2.3


From 4dd4aca705e02617399cad126b3d5638a5bb1837 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 18 Mar 2010 16:53:40 +0200
Subject: working on EXT-5839 Creating a new wearable ... some strings for
 localization

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d24873e9e6..934b3c8c5c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3073,4 +3073,25 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="uploading_abuse_report">Uploading...
   
 Abuse Report</string>
+
+  <!-- names for new inventory items-->
+  <string name="New Shape">New Shape</string>
+  <string name="New Skin">New Skin</string>
+  <string name="New Hair">New Hair</string>
+  <string name="New Eyes">New Eyes</string>
+  <string name="New Shirt">New Shirt</string>
+  <string name="New Pants">New Pants</string>
+  <string name="New Shoes">New Shoes</string>
+  <string name="New Socks">New Socks</string>
+  <string name="New Jacket">New Jacket</string>
+  <string name="New Gloves">New Gloves</string>
+  <string name="New Undershirt">New Undershirt</string>
+  <string name="New Underpants">New Underpants</string>
+  <string name="New Skirt">New Skirt</string>
+  <string name="New Alpha">New Alpha</string>
+  <string name="New Tattoo">New Tattoo</string>
+  <string name="Invalid Wearable">Invalid Wearable</string>
+  <string name="New Script">New Script</string>
+  <string name="New Folder">New Folder</string>
+  <string name="Contents">Contents</string>
 </strings>
-- 
cgit v1.2.3


From 155072934832baf42a0dd01f1d898ccad4782a11 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 18 Mar 2010 18:13:39 +0200
Subject: Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after
 name is truncated when the name is long. need 'en' xui rework)

* Changed the way blocked items are shown in the list. For now they are separated on two columns: Name & Type.
   If Name is too long it is shown truncated (with ...)

* As result remove deprecated methods from LLMute to concatenate its name & type and to extract name & type from the such concatenated string.
* reduce include dependence from llmutelist.h

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 072ea882e6..d3f6695375 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -39,7 +39,13 @@
      name="blocked"
      tool_tip="List of currently blocked Residents"
      top="30"
-     width="270" />
+     width="270">
+        <scroll_list.columns
+         name="item_name" />
+        <scroll_list.columns
+         name="item_type"
+         width="96" />
+    </scroll_list>
     <button
      follows="left|bottom"
      height="23"
-- 
cgit v1.2.3


From c74f87015118a6da7036623d026fc512f46af9d5 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 18 Mar 2010 19:42:38 +0200
Subject: (EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$) - Moved
 hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_buy_currency.xml |  2 +-
 indra/newview/skins/default/xui/en/strings.xml              | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 961bd6b5e4..e02d32596a 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -182,7 +182,7 @@
      width="180"
      layout="topleft"
      name="buy_action">
-        [NAME] L$ [PRICE]
+        [ACTION]
     </text>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 934b3c8c5c..47386bd332 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2202,7 +2202,8 @@ Clears (deletes) the media and all params from the given face.
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Acquired Items</string>
 	<string name="Cancel">Cancel</string>
-	<string name="UploadingCosts">Uploading %s costs</string>
+	<string name="UploadingCosts">Uploading [NAME] costs L$ [AMOUNT]</string>
+	<string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string>
 	<string name="UnknownFileExtension">
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
@@ -3060,11 +3061,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="to join a group">to join a group</string>
   <string name="to upload">to upload</string>
   
-  <string name="giving">Giving</string>
-  <string name="uploading_costs">Uploading costs</string>
-  <string name="this_costs">This costs</string>
-  <string name="buying_selected_land">Buying selected land</string>
-  <string name="this_object_costs">This object costs"</string>
+  <string name="giving">Giving L$ [AMOUNT]</string>
+  <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string>
+  <string name="this_costs">This costs L$ [AMOUNT]</string>
+  <string name="buying_selected_land">Buying selected land L$ [AMOUNT]</string>
+  <string name="this_object_costs">This object costs L$ [AMOUNT]</string>
   
   <string name="group_role_everyone">Everyone</string>
   <string name="group_role_officers">Officers</string>
-- 
cgit v1.2.3


From 978bf16797921d60351c09d9fc45721cceceb6e9 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 18 Mar 2010 21:51:27 +0200
Subject: Related to EXT-5909 (Accepted/declined inventory offer shouldn't
 spawn chiclet).

- Removed unnecessary string in strings.xml and substituted it in code with existing one.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 338612664a..4b9140ee90 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2915,7 +2915,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_default_text_label">Click here to instant message.</string>
 	<string name="IM_to_label">To</string>
 	<string name="IM_moderator_label">(Moderator)</string>
-  <string name="inventory_item_offered">Inventory item offered</string>
 
 	<!-- voice calls -->
 	<string name="started_call">Started a voice call</string>
-- 
cgit v1.2.3


From 8eeb11e25885375c556ffb60d0d38c955a910865 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 18 Mar 2010 13:13:14 -0700
Subject: EXT-6426 - Role titles with UTF-8 characters prevent login when
 enabled

reviewed by Monroe
---
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 19c0da4f08..0eb5c47f85 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -385,7 +385,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          follows="left|top|right"
          right="-1"
-         max_length="295"
+         max_length="20"
          name="role_name"
          top_pad="0"
          width="300">
@@ -408,7 +408,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          follows="left|top|right"
          right="-1"
-         max_length="295"
+         max_length="20"
          name="role_title"
          top_pad="0"
          width="300">
-- 
cgit v1.2.3


From 7f0739a1bf74bcec53c7cdb24594258a566c4688 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 18 Mar 2010 16:19:01 -0700
Subject: VWR-17631 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index c658e0de6f..e604e401f6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -164,7 +164,7 @@ Automatic position for:
      label="Opacity"
      layout="topleft"
      left="80"
-     label_width="50"
+     label_width="60"
      name="bubble_chat_opacity"
      width="200" />
     <color_swatch
-- 
cgit v1.2.3


From 0ff89dfe2a309bea013f7a9dd9bfc39bcfafde96 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 18 Mar 2010 16:39:14 -0700
Subject: EXT-6402 - Add support for enable/disable of Plugins (Flash) within
 WebKit to Viewer Prefs fixed radio item values so they work in true and false
 cases for UseExternalBrowser

reviewed by Callum
---
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 15f8b33f5b..fe882730f4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -283,7 +283,7 @@
       layout="topleft"
       left_delta="0"
       name="external"
-      value="true"
+      value="1"
       tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
       top_delta="20"
       width="480" />
-- 
cgit v1.2.3


From fabae99883ff724f0f46336cf787d99997ec9f33 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 18 Mar 2010 16:49:44 -0700
Subject: EXT-5923 - Change play/pause behavior of Nearby Media affordance
 reviewed by BenGlenn

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 0c870e155b..84664eedcc 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -94,10 +94,10 @@
     <button
      follows="right|top"
      height="16"
-     image_selected="Pause_Off"
-     image_unselected="Play_Off"
-     image_pressed="Play_Press"
-     image_pressed_selected="Pause_Press"
+     image_selected="Play_Off"
+     image_unselected="Pause_Off"
+     image_pressed="Pause_Press"
+     image_pressed_selected="Play_Press"
      is_toggle="true"
      left_pad="15"
      top="1"
-- 
cgit v1.2.3


From cb7fbc8a2093fd1ed5440d0f3184d9080cecad48 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 18 Mar 2010 16:53:27 -0700
Subject: EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature
 to disable Web plugins via prefs" and EXT-6401 "Add feature to disable
 Javascript via prefs" Apologies for the multiple commit of Jiras - these
 changes are closely related and impossible to commit deparately Reviewed by
 Monroe

---
 .../default/xui/en/panel_preferences_privacy.xml   |  9 ---
 .../default/xui/en/panel_preferences_setup.xml     | 75 +++++++++++++++++-----
 2 files changed, 60 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f232a69482..3d7f392404 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -68,15 +68,6 @@
      left="30"
      name="auto_disengage_mic_check"
      top_pad="10"
-     width="350" />
-    <check_box
-     control_name="CookiesEnabled"
-     height="16"
-     label="Accept cookies"
-     layout="topleft"
-     left="30"
-     name="cookies_enabled"
-     top_pad="10"
      width="350" />
 	<text
       type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index fe882730f4..96b9b459dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -265,18 +265,8 @@
    layout="topleft"
    left_delta="50"
    name="use_external_browser"
-   top_pad="4"
+   top_pad="-2"
    width="480">
-    <radio_item
-      height="20"
-      label="Use built-in browser"
-      layout="topleft"
-      left="0"
-      name="internal"
-      value=""
-      tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
-      top="0"
-      width="480" />
     <radio_item
       height="20"
       label="Use my browser (IE, Firefox, Safari)"
@@ -284,16 +274,71 @@
       left_delta="0"
       name="external"
       value="1"
+      top="0"
       tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
+      width="480" />
+    <radio_item
+      height="20"
+      label="Use built-in browser"
+      layout="topleft"
+      left="0"
+      name="internal"
+      value=""
+      tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
       top_delta="20"
       width="480" />
   </radio_group>
 
+  <check_box
+    top_delta="2"
+    enabled="true"
+    follows="left|top"
+    height="18"
+    initial_value="true"
+    control_name="BrowserPluginsEnabled"
+    label="Enable plugins"
+    left_delta="20"
+    mouse_opaque="true"
+    name="browser_plugins_enabled"
+    radio_style="false"
+    width="400"
+    top_pad="5"/>
+
+  <check_box
+   top_delta="4"
+   enabled="true"
+   follows="left|top"
+   height="14"
+   initial_value="true"
+   control_name="CookiesEnabled"
+   label="Accept cookies"
+   left_delta="0"
+   mouse_opaque="true" 
+   name="cookies_enabled"
+   radio_style="false"
+   width="400"
+   top_pad="5"/>
+  
   <check_box
     top_delta="4"
     enabled="true"
     follows="left|top"
-    height="16"
+    height="14"
+    initial_value="true"
+    control_name="BrowserJavascriptEnabled"
+    label="Enable Javascript"
+    left_delta="0"
+    mouse_opaque="true"
+    name="browser_javascript_enabled"
+    radio_style="false"
+    width="400"
+    top_pad="5"/>
+
+  <check_box
+    top_delta="4"
+    enabled="true"
+    follows="left|top"
+    height="14"
     initial_value="false"
     control_name="BrowserProxyEnabled"
     label="Enable Web Proxy"
@@ -308,9 +353,9 @@
    follows="left|top"
    height="10"
    layout="topleft"
-   left_delta="1"
+   left_delta="20"
    name="Proxy location"
-   top_delta="20"
+   top_delta="16"
    width="300">
     Proxy location:
   </text>
@@ -335,7 +380,7 @@
    increment="1"
    initial_value="80"
    label="Port number:"
-   label_width="75"
+   label_width="70"
    layout="topleft"
    left_delta="230"
    max_val="12000"
-- 
cgit v1.2.3


From 5a72ee937fc14730e69330e90fcd2ce6847bd081 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 18 Mar 2010 17:05:08 -0700
Subject: VWR-18276 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 627e616af5..d1e0746d9d 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -216,7 +216,7 @@ height="16"
 name="login_help"
 top_pad="2"
 right="-10"
-    width="180">
+    width="190">
        Need help logging in?   </text>
 <!--  <text
     follows="right|bottom"
-- 
cgit v1.2.3


From 627c5a365f4506c30af1471c4e1880f43922ca48 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Fri, 19 Mar 2010 16:59:25 +0200
Subject: (EXT-6470) [TRANSLATED BUT IN EN] Media Nav bar (Media Control) -
 Fixed panel name in en/panel_prim_media_controls.xml. Panel name mismatch in
 localized files prevented from using localized attributes (e.g. tool tips) of
 all children of this panel.

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/73/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 6b5f0c3896..6bf00373ea 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 	follows="left|right|top|bottom"
-	name="MediaControlsPanel"
+	name="MediaControls"
 	background_visible="false"
 	height="200"
 	layout="topleft"
-- 
cgit v1.2.3


From 8f40c559f37ec33886e34c42dc076d4bb28ab609 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 19 Mar 2010 17:03:17 +0200
Subject: Update for critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk
 button is truncated "Sprechen". need xui designer to widen it by some 10
 pixels * restored center aligning for Speak button's label. * also it is
 right aligned in 'de' locale which has too long value. * default right
 padding is set in 'en' locale (in has no effect on center aligned label)

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/36/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index e70a0512d6..58c5c11e51 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -74,12 +74,15 @@
            name="talk"
            top="5"
           width="105">
+            <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+             & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
   <speak_button
-    halign="left"
+    halign="center"
     name="speak_btn"
     label="Speak"
     label_selected="Speak"
-    pad_left="12"
+    pad_right="22"
+    use_ellipses="true"
     />
               <show_button>
                   <show_button.init_callback
-- 
cgit v1.2.3


From 4347af5763672d0b575ad255aa3565a51c0a632e Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 19 Mar 2010 17:03:32 +0200
Subject: Done normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel,
 profiles: the teleport button is truncated. need 'en' xui designer rework)  *
 moved Map Button into the dropdown menu (with enable/click logic). New
 <menu_item_call label="Map" name="show_on_map"> is added into the
 menu_profile_overflow.xml  * redesigned rest of buttons to accommodate
 available space

Now buttons' widths are enough to not truncate labels in all locales.
NOTE: New "Map" item menu should be localized (just move values from panel_profile.xml to menu_profile_overflow.xml) in other locales.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/59/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_profile_overflow.xml |  9 +++++++
 .../newview/skins/default/xui/en/panel_profile.xml | 30 ++++++----------------
 2 files changed, 17 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index 5162a4902f..b0b7b554b0 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -5,6 +5,15 @@
  mouse_opaque="false"
  name="profile_overflow_menu"
  width="120">
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="Profile.ShowOnMap" />
+        <menu_item_call.on_enable
+         function="Profile.EnableShowOnMap" />
+    </menu_item_call>
     <menu_item_call
      label="Pay"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 9fcabc7722..30191aecb6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -311,7 +311,7 @@
          height="23"
          label="Add Friend"
          layout="topleft"
-         left="1"
+         left="2"
          mouse_opaque="false"
          name="add_friend"
          pad_left="1" 
@@ -319,7 +319,7 @@
          tool_tip="Offer friendship to the Resident"
          top="5"
          use_ellipses="true"
-         width="105" />
+         width="117" />
         <button
          follows="bottom|left"
          height="23"
@@ -328,8 +328,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="0"
-         width="19" />
+         left_pad="1"
+         width="21" />
         <button
          follows="bottom|left"
          height="23"
@@ -337,26 +337,12 @@
          layout="topleft"
          name="call"
          tool_tip="Call this Resident"
-         left_pad="0"
+         left_pad="1"
          pad_left="1" 
          pad_right="1"
          top="5"
          use_ellipses="true"
-         width="48" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         name="show_on_map_btn"
-         pad_left="1" 
-         pad_right="1"
-         tool_tip="Show the Resident on the map"
-         top="5"
-         left_pad="0"
-         use_ellipses="true"
-         width="33" />
+         width="51" />
         <button
          follows="bottom|left"
          height="23"
@@ -364,12 +350,12 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="0"
+         left_pad="1"
          pad_left="1" 
          pad_right="1"
          top="5"
          use_ellipses="true"
-         width="81" />
+         width="92" />
         <button
          follows="bottom|right"
          height="23"
-- 
cgit v1.2.3


From 6583a6d648d2ad71d52a4bc47c0b009a71a3bf41 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 19 Mar 2010 18:40:59 +0200
Subject: Fixed bug EXT-5927 (Vertical tab labels should be left-aligned).

Submitting on behalf of Paul Guslisty.

Reviewed by Mike and Q: https://codereview.productengine.com/secondlife/r/70/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_preferences.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index b5a3764e73..49361784ae 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -39,6 +39,7 @@
     </button>
     <tab_container
      follows="all"
+     halign="left"
      height="410"
      layout="topleft"
      left="0"
-- 
cgit v1.2.3


From ab23ae02291708ee703630b01982412d85417a1a Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 19 Mar 2010 20:49:02 +0200
Subject: Implemented normal task EXT-6379 ([TRUNCATION] [EN XUI REDESIGN] -
 Receiving Landmarks).

- Button order was fixed in changeset dd44dac25177. It was an implemetation of EXT-5906 (Reverse buttons order in the inventory offers). That changeset
was included in cumulative diff at https://codereview.productengine.com/secondlife/r/52/ and already made its way into viewer 2-0.

- This changeset removes inventory offer button truncation in IM in German locale by increasing default width of IM floater and decreasing distance between buttons.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/77/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 25016e0673..422e50f035 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -13,7 +13,7 @@
  can_minimize="true"
  can_close="true"
  visible="false"
- width="360"
+ width="385"
  can_resize="true"
  min_width="250"
  min_height="190">
@@ -22,7 +22,7 @@
    default_tab_group="2"
   follows="all"
   height="320"
-  width="360"
+  width="385"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
-- 
cgit v1.2.3


From 90b8ed39e2cdd6bf6666a34060d5ee9347102237 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 19 Mar 2010 22:19:40 +0200
Subject: Fixed bug EXT-5726 (Macintosh shortcut for "Nearby Chat" menu item is
 incorrect)

Submitting on behalf of Eugene Mutavchi.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 158e764eae..a08bc16066 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -177,7 +177,8 @@
          label="Nearby Chat"
          layout="topleft"
          name="Nearby Chat"
-         shortcut="control|H">
+         shortcut="control|H"
+         use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="nearby_chat" />
-- 
cgit v1.2.3


From ee4303efde48c7ac5da1bdf4cbd53be457f4aceb Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Fri, 19 Mar 2010 15:23:45 -0700
Subject: Build tool tabs too wide after merging loc xui - make floater 15px
 wider

---
 .../newview/skins/default/xui/en/floater_tools.xml | 186 ++++++++++-----------
 1 file changed, 88 insertions(+), 98 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 43a221d0e1..c27b251112 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -12,7 +12,7 @@
  short_title="BUILD TOOLS"
  single_instance="true"
  sound_flags="0"
- width="280">
+ width="295">
     <floater.string
      name="status_rotate">
         Drag colored bands to rotate object
@@ -152,7 +152,7 @@
      left="8"
      name="text status"
      top_pad="3"
-     width="275">
+     width="285">
         Drag to move, shift-drag to copy
     </text>
    <radio_group
@@ -330,7 +330,7 @@
      top_delta="0"
      right="-10"
      width="18"
-     height="19" >
+     height="23" >
 	 <button.commit_callback
 	     function="BuildTool.gridOptions"/>
 	</button>
@@ -342,7 +342,7 @@
      image_selected="Object_Cube_Selected"
      image_unselected="Object_Cube"
      layout="topleft"
-     left="4"
+     left="10"
      name="ToolCube"
      tool_tip="Cube"
      top="51"
@@ -355,7 +355,7 @@
      image_selected="Object_Prism_Selected"
      image_unselected="Object_Prism"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolPrism"
      tool_tip="Prism"
      top_delta="0"
@@ -368,7 +368,7 @@
      image_selected="Object_Pyramid_Selected"
      image_unselected="Object_Pyramid"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolPyramid"
      tool_tip="Pyramid"
      top_delta="0"
@@ -381,7 +381,7 @@
      image_selected="Object_Tetrahedron_Selected"
      image_unselected="Object_Tetrahedron"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolTetrahedron"
      tool_tip="Tetrahedron"
      top_delta="0"
@@ -394,7 +394,7 @@
      image_selected="Object_Cylinder_Selected"
      image_unselected="Object_Cylinder"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolCylinder"
      tool_tip="Cylinder"
      top_delta="0"
@@ -407,7 +407,7 @@
      image_selected="Object_Hemi_Cylinder_Selected"
      image_unselected="Object_Hemi_Cylinder"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolHemiCylinder"
      tool_tip="Hemicylinder"
      top_delta="0"
@@ -420,7 +420,7 @@
      image_selected="Object_Cone_Selected"
      image_unselected="Object_Cone"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolCone"
      tool_tip="Cone"
      top_delta="0"
@@ -433,7 +433,7 @@
      image_selected="Object_Hemi_Cone_Selected"
      image_unselected="Object_Hemi_Cone"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolHemiCone"
      tool_tip="Hemicone"
      top_delta="0"
@@ -446,7 +446,7 @@
      image_selected="Object_Sphere_Selected"
      image_unselected="Object_Sphere"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolSphere"
      tool_tip="Sphere"
      top_delta="0"
@@ -459,7 +459,7 @@
      image_selected="Object_Hemi_Sphere_Selected"
      image_unselected="Object_Hemi_Sphere"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolHemiSphere"
      tool_tip="Hemisphere"
      top_delta="0"
@@ -472,7 +472,7 @@
      image_selected="Object_Torus_Selected"
      image_unselected="Object_Torus"
      layout="topleft"
-     left="4"
+     left="10"
      name="ToolTorus"
      tool_tip="Torus"
      top="77"
@@ -485,7 +485,7 @@
      image_selected="Object_Tube_Selected"
      image_unselected="Object_Tube"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolTube"
      tool_tip="Tube"
      top_delta="0"
@@ -498,7 +498,7 @@
      image_selected="Object_Ring_Selected"
      image_unselected="Object_Ring"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolRing"
      tool_tip="Ring"
      top_delta="0"
@@ -511,7 +511,7 @@
      image_selected="Object_Tree_Selected"
      image_unselected="Object_Tree"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolTree"
      tool_tip="Tree"
      top_delta="0"
@@ -525,7 +525,7 @@
      image_unselected="Object_Grass"
      image_overlay_color="Red"
      layout="topleft"
-     left_delta="26"
+     left_delta="29"
      name="ToolGrass"
      tool_tip="Grass"
      top_delta="0"
@@ -639,7 +639,7 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="150"
+     left="135"
      name="Bulldozer:"
      top="57"
      width="100">
@@ -697,7 +697,7 @@
     </slider_bar>
     <button
      follows="left|top"
-     height="19"
+     height="23"
      label="Apply"
      label_selected="Apply"
      top_pad="5"
@@ -713,13 +713,13 @@
     text_color="LtGray_50"
      type="string"
      length="1"
-     height="12"
+     height="10"
      follows="left|top"
      halign="right"
      layout="topleft"
      right="-10"
      name="obj_count"
-     top_pad="6"
+     top_pad="5"
      width="143">
         Objects: [COUNT]
     </text>
@@ -746,7 +746,7 @@
      tab_position="top"
      tab_height="25"
      top="170"
-     width="280">
+     width="295">
 	<panel
 	 border="false"
 	 follows="all"
@@ -756,8 +756,8 @@
 	 help_topic="toolbox_general_tab"
 	 name="General"
 	 top="16"
-	 width="280">
-	 <panel.string
+	 width="295">
+<panel.string
 	  name="text deed continued">
 		Deed
 	 </panel.string>
@@ -922,13 +922,13 @@
              width="150" />
             <button
              follows="top|left"
-             height="20"
+             height="23"
              label="Deed"
              label_selected="Deed"
              layout="topleft"
              name="button deed"
              top_pad="0"
-             left="100"
+             left="108"
              tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
              width="80" />
             <check_box
@@ -949,12 +949,12 @@
              top_pad="15"
              left="10"
              name="label click action"
-             width="90">
+             width="98">
                 Click to:
             </text>
             <combo_box
              follows="left|top"
-             height="20"
+             height="23"
              layout="topleft"
              name="clickaction"
              width="168"
@@ -985,25 +985,24 @@
                  value="Zoom" />
             </combo_box>
             <check_box
-             height="16"
-             top_pad="15"
+             height="23"
              label="For Sale:"
              layout="topleft"
              name="checkbox for sale"
              left="7"
-             width="93" />
+             width="100" />
 <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
-            left_pad="3"
+            left_pad="0"
             layout="topleft"
             follows="left|top"
             allow_text_entry="false"
-            height="20"
+            height="23"
             intial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
-            width="158">
+            width="168">
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1026,12 +1025,12 @@ even though the user gets a free copy.
         decimal_digits="0"
         increment="1"
         top_pad="8"
-        left="100"
+        left="108"
         control_name="Edit Cost"
         name="Edit Cost"
         label="Price: L$"
         label_width="65"
-        width="150"
+        width="165"
         min_val="0"
         height="20"
         max_val="999999999" />
@@ -1055,7 +1054,7 @@ even though the user gets a free copy.
          left="0"
          top="241"
          height="130"
-         width="278">
+         width="290">
             <text
              type="string"
              length="1"
@@ -1082,7 +1081,7 @@ even though the user gets a free copy.
              label="Move"
              layout="topleft"
              name="checkbox allow everyone move"
-             left="15"
+             left="10"
              width="85" />
             <check_box
              height="19"
@@ -1104,9 +1103,9 @@ even though the user gets a free copy.
              follows="left|top|right"
              label="Modify"
              layout="topleft"
-             left="5"
+             left="10"
              name="checkbox next owner can modify"
-             width="80" />
+             width="85" />
             <check_box
              follows="left|top|right"
              height="19"
@@ -1212,7 +1211,7 @@ even though the user gets a free copy.
          help_topic="toolbox_object_tab"
          name="Object"
          top="16"
-         width="280">
+         width="295">
             <check_box
              height="19"
              label="Locked"
@@ -1553,7 +1552,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="125"
              name="text hollow"
-             top_pad="5"
+             top_pad="6"
              width="68">
                 Hollow
             </text>
@@ -1601,16 +1600,16 @@ even though the user gets a free copy.
              layout="topleft"
              left="125"
              name="Hollow Shape"
-             top_pad="0"
+             top_pad="4"
              width="150">
                 Hollow Shape
             </text>
             <combo_box
-             height="19"
+             height="23"
              layout="topleft"
              left_delta="0"
              name="hole"
-             top_pad="3"
+             top_pad="-2"
              width="150">
                 <combo_box.item
                  label="Default"
@@ -1882,7 +1881,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="125"
              name="text radius delta"
-             top_pad="0"
+             top_pad="2"
              width="78">
                 Radius
             </text>
@@ -1999,7 +1998,6 @@ even though the user gets a free copy.
                  value="Cylinder" />
             </combo_box>
         </panel>
-
         <panel
          border="false"
          follows="all"
@@ -2011,7 +2009,7 @@ even though the user gets a free copy.
          help_topic="toolbox_features_tab"
          name="Features"
          top_delta="0"
-         width="280">
+         width="295">
             <text
              type="string"
              length="1"
@@ -2249,7 +2247,7 @@ even though the user gets a free copy.
          help_topic="toolbox_texture_tab"
          name="Texture"
          top_delta="0"
-         width="280">
+         width="295">
             <panel.string
              name="string repeats per meter">
                 Repeats Per Meter
@@ -2313,7 +2311,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="0"
              name="glow label"
-             top_pad="2"
+             top_pad="8"
              width="80">
                 Glow
             </text>
@@ -2344,7 +2342,7 @@ even though the user gets a free copy.
              left="10"
              name="tex gen"
              top_pad="5"
-             width="85">
+             width="90">
                 Mapping
             </text>
             <combo_box
@@ -2353,7 +2351,7 @@ even though the user gets a free copy.
              left_delta="0"
              name="combobox texgen"
              top_pad="4"
-             width="85">
+             width="90">
                 <combo_box.item
                  label="Default"
                  name="Default"
@@ -2372,7 +2370,7 @@ even though the user gets a free copy.
              name="label shininess"
              left_pad="4"
              top_pad="-36"
-             width="85">
+             width="90">
                 Shininess
             </text>
             <combo_box
@@ -2381,7 +2379,7 @@ even though the user gets a free copy.
              left_delta="0"
              name="combobox shininess"
              top_pad="4"
-             width="85">
+             width="90">
                 <combo_box.item
                  label="None"
                  name="None"
@@ -2408,7 +2406,7 @@ even though the user gets a free copy.
              left_pad="4"
              name="label bumpiness"
              top_pad="-36"
-             width="85">
+             width="90">
                 Bumpiness
             </text>
             <combo_box
@@ -2417,7 +2415,7 @@ even though the user gets a free copy.
              left_delta="0"
              name="combobox bumpiness"
              top_pad="4"
-             width="85">
+             width="90">
                 <combo_box.item
                  label="None"
                  name="None"
@@ -2533,7 +2531,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="10"
              name="tex scale"
-             top_pad="5"
+             top_pad="4"
              width="200">
                 Repeats / Face
             </text>
@@ -2567,7 +2565,6 @@ even though the user gets a free copy.
              left="20"
              max_val="100"
              name="TexScaleV"
-             top_pad="0"
              width="160" />
             <check_box
              height="19"
@@ -2577,7 +2574,6 @@ even though the user gets a free copy.
              name="checkbox flip t"
              top_delta="0"
              width="70" />
-
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -2591,13 +2587,12 @@ even though the user gets a free copy.
              max_val="9999"
              min_val="-9999"
              name="TexRot"
-             top_delta="25"
              width="170" />
 
             <spinner
              decimal_digits="1"
              follows="left|top"
-             height="19"
+             height="23"
              initial_value="1"
 			 label="Repeats / Meter"
              layout="topleft"
@@ -2606,7 +2601,6 @@ even though the user gets a free copy.
              max_val="10"
              min_val="0.1"
              name="rptctrl"
-             top_delta="20"
              width="170" />
             <button
              follows="left|top"
@@ -2625,7 +2619,6 @@ even though the user gets a free copy.
              layout="topleft"
              left="10"
              name="tex offset"
-             top_delta="20"
              width="200">
                 Texture Offset
             </text>
@@ -2639,7 +2632,6 @@ even though the user gets a free copy.
              left="20"
              min_val="-1"
              name="TexOffsetU"
-             top_pad="6"
              width="160" />
             <spinner
              follows="left|top"
@@ -2662,30 +2654,20 @@ even though the user gets a free copy.
          bg_alpha_color="DkGray"
          name="Add_Media"
          left="0"
-         top_pad="0"
-         height="75"
-         width="278">
+         height="63"
+         width="290">
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="12"
+             height="18"
              layout="topleft"
              left="10"
-             top_pad="5"
+             top_pad="3"
              name="media_tex"
-             width="260">
+             width="190">
               Media
 			</text>
-			<text
-			 follows="left|top|right"
-			 height="18"
-			 layout="topleft"
-			 left="10"
-                         use_ellipses="true"
-			 read_only="true"
-			 name="media_info"
-			 width="180" />
 			<button
 			 follows="top|left"
 			 height="18"
@@ -2731,6 +2713,15 @@ even though the user gets a free copy.
 				<button.commit_callback
 				function="BuildTool.EditMedia"/>
 			</button>
+      <text
+			 follows="left|top|right"
+			 height="9"
+			 layout="topleft"
+			 left="10"
+                         use_ellipses="true"
+			 read_only="true"
+			 name="media_info"
+			 width="280" />
       <web_browser
         visible="false"
         enabled="false"
@@ -2744,16 +2735,15 @@ even though the user gets a free copy.
         start_url="about:blank"
         decouple_texture_size="true" />
      <button
-			 follows="left|top"
-			 height="23"
+			 follows="right|top"
+			 height="22"
 			 label="Align"
 			 label_selected="Align Media"
 			 layout="topleft"
-			 left="10"
+			 right="-10"
 			 name="button align"
-			 top_pad="5"
 			 tool_tip="Align media texture (must load first)"
-			 width="100" />
+			 width="80" />
 		</panel>
 	   </panel>
        <panel
@@ -2766,36 +2756,36 @@ even though the user gets a free copy.
          help_topic="toolbox_contents_tab"
          name="Contents"
          top_delta="0"
-         width="280">
+         width="295">
             <button
              follows="left|top"
-             height="19"
+             height="23"
              label="New Script"
              label_selected="New Script"
              layout="topleft"
              left="10"
              name="button new script"
              top="10"
-             width="120" />
+             width="134" />
             <button
              follows="left|top"
-             height="19"
+             height="23"
              label="Permissions"
              layout="topleft"
              left_pad="8"
              name="button permissions"
-             width="130" />
+             width="134" />
             <panel_inventory_object
              border="true"
              border_visible="true"
              bevel_style="in"
-             follows="left|top"
+             follows="left|top|right"
              height="325"
              layout="topleft"
              left="10"
              name="contents_inventory"
              top="50"
-             width="260" />
+             width="275" />
 		</panel>
         </tab_container>
 	<panel
@@ -2805,7 +2795,7 @@ even though the user gets a free copy.
      left_delta="0"
      name="land info panel"
      top_delta="0"
-     width="280">
+     width="295">
     <text
          type="string"
          length="1"
@@ -2845,7 +2835,7 @@ even though the user gets a free copy.
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="About Land"
          label_selected="About Land"
          layout="topleft"
@@ -2878,7 +2868,7 @@ even though the user gets a free copy.
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Subdivide"
          label_selected="Subdivide"
          layout="topleft"
@@ -2888,7 +2878,7 @@ even though the user gets a free copy.
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Join"
          label_selected="Join"
          layout="topleft"
@@ -2911,7 +2901,7 @@ even though the user gets a free copy.
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Buy Land"
          label_selected="Buy Land"
          layout="topleft"
@@ -2921,7 +2911,7 @@ even though the user gets a free copy.
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Abandon Land"
          label_selected="Abandon Land"
          layout="topleft"
-- 
cgit v1.2.3


From 6e4f9b9073f735dd169f09f35811d14736b4cd0c Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Sun, 21 Mar 2010 19:40:50 -0400
Subject: Change wording per Legal request (Marty)

---
 indra/newview/skins/default/xui/en/floater_tos.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 5e168fe4aa..f3665e87ed 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -33,7 +33,7 @@
     <check_box
      follows="top|right"
      height="16"
-     label="I Agree to the Terms of Service"
+     label="I Agree to the Terms of Service and Privacy Policy"
      layout="topleft"
      left_delta="0"
      name="agree_chk"
@@ -51,7 +51,7 @@
      top_delta="-399"
      word_wrap="true"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
+        Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
     <web_browser
      follows="left|top"
-- 
cgit v1.2.3


From 61d2caee9f9474a6ccb6c13a4727e3527bd7c938 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 22 Mar 2010 21:47:56 +0200
Subject: Fixed bug EXT-6446 (Profile Real World description gets messed up if
 out of the old characters' number limit).

Submitting on behalf of Dmitry Zaporozhan.

Reviewed by me and Richard: https://codereview.productengine.com/secondlife/r/67/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 26be8440e7..dff2b9a214 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -146,7 +146,7 @@
        layout="topleft"
        left="123"
        top="25"
-       max_length="512"
+       max_length="511"
        name="sl_description_edit"
        width="157"
        word_wrap="true">
@@ -200,7 +200,7 @@
        height="102"
        layout="topleft"
        left="123"
-       max_length="512"
+       max_length="254"
        top="157"
        name="fl_description_edit"
        width="157"
-- 
cgit v1.2.3


From ad15c4e3287772513e9f5d01917de7f7a455a509 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 22 Mar 2010 13:50:22 -0700
Subject: EXT-5926 Layout of upper-right menu/nav bar is wonky

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 84664eedcc..8c7de22cf8 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -99,7 +99,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="15"
+     left_pad="20"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
@@ -112,12 +112,12 @@
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="5"
+     left_pad="10"
      top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-    <text
+  <!--  <text
      follows="right|top"
      halign="center"
      height="12"
@@ -125,5 +125,5 @@
      left_delta="0"
      name="stat_btn"
      top_delta="0"
-     width="20"/>
+     width="20"/>-->
 </panel>
-- 
cgit v1.2.3


From e310350a2c45f5011d6f2125dccdd502f34716c5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 23 Mar 2010 15:38:51 -0700
Subject: EXT-6404 - [TRANSPARENT MENU IN EN] Snapshot floater, all pull-down
 menus become transparent

reviewed by Leyla
---
 indra/newview/skins/default/xui/en/main_view.xml | 28 +++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 1ace760816..e8f9d65be5 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -172,6 +172,24 @@
          class="progress_view"
          width="1024"
          visible="false"/>
+  <panel top="0"
+        follows="all"
+        mouse_opaque="false"
+        left="0"
+        name="snapshot_floater_view_holder" 
+        width="1024"
+        height="798">
+    <snapshot_floater_view enabled="false"
+                           follows="all"
+                           height="768"
+                           left="0"
+                           mouse_opaque="false"
+                           name="Snapshot Floater View"
+                           tab_stop="false"
+                           top="0"
+                           visible="false"
+                           width="1024"/>
+  </panel>
   <panel top="0"
          follows="all"
          height="768"
@@ -185,16 +203,6 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
-  <snapshot_floater_view enabled="false"
-                         follows="all"
-                         height="768"
-                         left="0"
-                         mouse_opaque="false"
-                         name="Snapshot Floater View"
-                         tab_stop="false"
-                         top="0"
-                         visible="false"
-                         width="1024"/>
   <tooltip_view top="0"
                 follows="all"
                 height="768"
-- 
cgit v1.2.3


From 770fb57a6c88e99411b2fddf3f590bc38452ec90 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 23 Mar 2010 17:03:07 -0700
Subject: VWR-17383 refix, en_xui_change

---
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 96b9b459dd..2123e62daa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -380,9 +380,9 @@
    increment="1"
    initial_value="80"
    label="Port number:"
-   label_width="70"
+   label_width="95"
    layout="topleft"
-   left_delta="230"
+   left_delta="210"
    max_val="12000"
    min_val="10"
    name="web_proxy_port"
-- 
cgit v1.2.3


From ea8f1b80df0fcfcdbb52123b2ece68916ed139ff Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 23 Mar 2010 17:28:57 -0700
Subject: EXT-5982 correcting meaning error

---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 47386bd332..00bbbd65d0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3064,7 +3064,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="giving">Giving L$ [AMOUNT]</string>
   <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string>
   <string name="this_costs">This costs L$ [AMOUNT]</string>
-  <string name="buying_selected_land">Buying selected land L$ [AMOUNT]</string>
+  <string name="buying_selected_land">Buying selected land for L$ [AMOUNT]</string>
   <string name="this_object_costs">This object costs L$ [AMOUNT]</string>
   
   <string name="group_role_everyone">Everyone</string>
-- 
cgit v1.2.3


From 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Wed, 24 Mar 2010 01:18:04 -0400
Subject: EXT-6514 -- add missing follows attribute to a panel so that it
 doesn't block other things as it moves around the screen.

---
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 12c06504ca..e5382e1e3f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -399,6 +399,7 @@ top_pad="10"
 			    top_pad="10"/>
    </panel>
     <panel
+		 follows="bottom|left"
 		 height="30"
 		 layout="topleft"
 		 name="button_panel"
-- 
cgit v1.2.3