From 87c6a2964325f7771cf03f6f7e82253a132c0e6d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 20:01:09 +0800
Subject:  EXT-2956 Animation preview floater play/pause buttons are hard-coded

---
 .../default/xui/en/floater_animation_preview.xml   | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

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

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 a8f875754e..4f4288b654 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -456,26 +456,43 @@ Maximum animation length is [MAX_LENGTH] seconds.
      image_overlay="Play_Over"
      image_unselected="SegmentedBtn_Left_Off"
      image_selected="SegmentedBtn_Left_On_Selected"
-        image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-        image_disabled="SegmentedBtn_Left_Disabled"
-	image_pressed="SegmentedBtn_Left_Press"
-	image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
      layout="topleft"
      left="10"
      name="play_btn"
-     tool_tip="Play/pause your animation"
+     tool_tip="Play your animation"
      top_pad="0"
      width="23" />
+    <button
+	 visible = "false"
+     follows="top|right"
+     height="23"
+     image_overlay="Pause_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="pause_btn"
+     tool_tip="Pause your animation"
+     top_pad="-23"
+     width="23" />	 
     <button
      follows="top|right"
      height="23"
      image_overlay="StopReload_Over"
      image_unselected="SegmentedBtn_Right_Off"
      image_selected="SegmentedBtn_Right_On_Selected"
-        image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
-        image_disabled="SegmentedBtn_Right_Disabled"
-	image_pressed="SegmentedBtn_Right_Press"
-	image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Right_Disabled"
+	 image_pressed="SegmentedBtn_Right_Press"
+	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
      layout="topleft"
      name="stop_btn"
      tool_tip="Stop animation playback"
-- 
cgit v1.2.3


From 5d4959e3a107a6a40014528dd8e17e46bf128540 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 22:25:12 +0800
Subject: EXT-2827 Unable to delete object when select face of object

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

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

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 4f4288b654..26ace7b617 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -525,7 +525,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 We recommend BVH files exported from Poser 4.
     </text>
     <button
-    	top="580"
+	 top="580"
      follows="bottom|left"
      height="23"
      label="Upload (L$[AMOUNT])"
@@ -534,7 +534,7 @@ We recommend BVH files exported from Poser 4.
      name="ok_btn"
      width="128" />
     <button
-    	top="580"
+	 top="580"
      follows="bottom|left"
      height="23"
      label="Cancel"
-- 
cgit v1.2.3


From b725027713912c5baaa3d812db939247cec2fae1 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Dec 2009 12:00:30 -0800
Subject: EXT-1498 Can't adjust nav bar info button location in XML Removed C++
 code overriding the location. Trivial, not reviewed.

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 0e2700cb80..17fb58764b 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -22,9 +22,12 @@
                 >
   <!-- *NOTE: Tooltips are in strings.xml so they can be localized.
   See LocationCtrlAddLandmarkTooltip etc. -->
-  <info_button name="Place Information"
-                          width="16"
-                          height="16"
+  <info_button
+    name="Place Information"
+    width="16"
+    height="16"
+    left="4" 
+    top="20" 
                           follows="left|top"
                           hover_glow_amount="0.15"
                           image_unselected="Info_Off"
-- 
cgit v1.2.3


From bd4ae13c5c14c44648d271284306daa89875b9bb Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 13:34:27 -0800
Subject: EXT-2854 (small addition) Localizability: consistency to a few places
 when referring generically to a choice of - Select one -

---
 indra/newview/skins/default/xui/en/floater_sell_land.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_classified.xml    | 2 +-
 indra/newview/skins/default/xui/en/panel_group_general.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index e6a78563f3..409f46b960 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -182,7 +182,7 @@
      width="130">
         <combo_box.item
          enabled="false"
-         label="-- select one --"
+         label="- Select one -"
          name="--selectone--"
          value="select" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
index 9622313786..c8293d3663 100644
--- a/indra/newview/skins/default/xui/en/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -107,7 +107,7 @@
      top="48"
      width="130">
         <combo_box.item
-         label="- Select Mature -"
+         label="- Select one -"
          name="select_mature"
          value="Select" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 043edd10e1..e5dc4df0f8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -145,7 +145,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left="10"
          name="group_mature_check"
-         tool_tip="Sets whether your group information is considered moderate"
+         tool_tip="Sets whether your group contains information rated as Moderate"
          top_pad="0"
          width="190">
             <combo_box.item
-- 
cgit v1.2.3


From f644dde8c9239e45348279229ded70620c3297d4 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Fri, 4 Dec 2009 13:55:20 -0800
Subject: Added back forward home button art to sidetray home buttons

---
 .../default/xui/en/panel_sidetray_home_tab.xml     | 49 +++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 4b841b0a09..605058825e 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -28,44 +28,43 @@
      top="0"
      user_resize="false"
      width="313">
-      <button
-       follows="left|top"
+          <button
        enabled="false"
-       height="20"
-       label="Back"
-       layout="topleft"
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Left_Off"
+	     layout="topleft"
        tab_stop="false"
        left="0"
        name="back"
-       top="0"
-       width="70">
+	     tool_tip="Back"
+	     width="25" >
         <button.commit_callback
          function="MediaBrowser.Back" />
       </button>
-      <button
-       follows="left|top"
-       height="20"
+             <button
+	     follows="left|top"
+	     height="18"
        enabled="false"
-       label="Forward"
-       layout="topleft"
-       tab_stop="false"
-       left_pad="3"
+	     image_overlay="Arrow_Right_Off"
+	     layout="topleft"
+	     left_pad="3"
        name="forward"
-       top_delta="0"
-       width="70">
+	     tool_tip="Forward"
+	     width="25">
         <button.commit_callback
          function="MediaBrowser.Forward" />
-      </button>
-      <button
-       follows="left|top"
-       height="20"
-       label="Home"
-       layout="topleft"
+         </button>
+
+	    <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Home_Press"
+	     layout="topleft"
+	     left_pad="20"
        tab_stop="false"
-       left_pad="2"
        name="home"
-       top_delta="0"
-       width="70">
+	     width="25">
         <button.commit_callback
          function="MediaBrowser.Home" />
       </button>
-- 
cgit v1.2.3


From 6e50ea94d2aae2653d5de3e4e160a2c4c0557f3b Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 14:02:14 -0800
Subject: L10N:  use better, consistent language in a preference about IMs.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 3aa5d3fae4..fff53c1de2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -332,7 +332,7 @@
      control_name="ChatWindow"
      name="chat_window"
      top_pad="10"
-     tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)"
+     tool_tip="Show your Instant Messages in separate windows, or in one window with many tabs (Requires restart)"
      width="331">
      <radio_item
       height="16"
-- 
cgit v1.2.3


From 9d268e0a4b3df48a74cd609255903a7c64ccfc35 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 14:05:30 -0800
Subject: L10N:  fix a typo. Use natural, consistent language in tool_tips
 about Picks.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 52bc72fe86..4facedc7ea 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -106,7 +106,7 @@
              layout="topleft"
              left_pad="15"
              name="new_btn"
-             tool_tip="Create new pick or classified at current location"
+             tool_tip="Create a new pick or classified at the current location"
              top="5"
              width="18" />
             <button
@@ -138,7 +138,7 @@
          left="5"
          name="info_btn"
          tab_stop="false"
-         tool_tip="Show pic information"
+         tool_tip="Show pick information"
          top="0"
          width="55" />
         <button
@@ -162,7 +162,7 @@
          left_pad="5"
          name="show_on_map_btn"
          tab_stop="false"
-         tool_tip="Show corresponding area on the world map"
+         tool_tip="Show the corresponding area on the World Map"
          top="0"
          width="50" />
         </panel>
-- 
cgit v1.2.3


From 7efab06d57624f6d7568abacef667468f11ed2ba Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 15:11:15 -0800
Subject: L10N:  use consistent language in the Admin menu 'Force owner'
 options

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 37136af680..38e5a28166 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3415,7 +3415,7 @@
          name="Parcel"
          tear_off="true">
             <menu_item_call
-             label="Owner To Me"
+             label="Force Owner To Me"
              layout="topleft"
              name="Owner To Me">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 7a83e8913d2eb6485eaf63e89a1ccc138a5a738f Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Dec 2009 16:05:04 -0800
Subject: EXT-3176 Resizing the nav bar resizes the world view Trivial XML
 change.

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

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a11ebf5af8..65a545d2ed 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -19,6 +19,7 @@
                   mouse_opaque="false"
                   name="nav_bar_container"
                   width="1024"
+                  user_resize="false" 
                   visible="false">
     </layout_panel>
     <layout_panel auto_resize="true"
@@ -43,7 +44,7 @@
                layout="topleft"
                mouse_opaque="false"
                name="non_side_tray_view"
-               user_resize="true"
+               user_resize="false"
                width="500">
           <view bottom="500"
                 follows="all"
-- 
cgit v1.2.3


From 329d5553027c5a1aacae6b01dc57db8f94510b6d Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Mon, 7 Dec 2009 12:51:37 -0500
Subject: Set font size to SansSerifSmall.
 http://jira.secondlife.com/browse/EXT-2773

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index ab3f8df5f8..d7af6077e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <spinner text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
-         font="SansSerif" 
+         font="SansSerifSmall" 
          decimal_digits="3"
          label_width="40" >
   <spinner.up_button name="SpinCtrl Up"
-- 
cgit v1.2.3