From c50cb47495bc7988544434156b99135fcbf9634f Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 24 Nov 2009 12:35:35 -0500
Subject: Copied layout from panel_pick_list_item.xml.
 http://jira.secondlife.com/browse/EXT-2734

---
 .../default/xui/en/panel_classifieds_list_item.xml | 39 ++++++++++------------
 1 file changed, 18 insertions(+), 21 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index ee333be0cb..b881719e3a 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -12,24 +12,24 @@
      follows="all"
      height="85"
      image_name="ListItem_Over"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="hovered_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308"/>
     <icon
      follows="all"
      height="85"
      image_name="ListItem_Select"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="selected_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308"/>
     <texture_picker
      allow_no_texture="true"
      border_enabled="true"
@@ -47,37 +47,34 @@
      width="90" />
     <text
      follows="top|left|right"
-     font="SansSerifSmallBold"
-     height="16"
+     font="SansSerifSmall"
+     height="15"
      layout="topleft"
      left="110"
      name="name"
      text_color="white"
      top="9"
-     use_ellipses="false"
-     width="197"
+     use_ellipses="true"
+     width="193"
      word_wrap="false" />
     <expandable_text
      follows="top|left|right"
      font="SansSerifSmall"
-     height="40"
+     height="55"
      layout="topleft"
-     left="110"
+     left="103"
      name="description"
-     top_pad="3"
+     top_pad="0"
      width="178"
      word_wrap="true" />
     <button
-     follows="top|right"
-     height="16"
-     image_selected="BuyArrow_Press"
-     image_pressed="BuyArrow_Press"
-     image_unselected="BuyArrow_Press"
+     follows="right"
+     height="20"
+     image_overlay="ForwardArrow_Off"
      layout="topleft"
+     left_pad="5"
+     right="-8"
      name="info_chevron"
-     picture_style="true"
-     right="-7"
-     tab_stop="false"
-     top="27"
-     width="16" />
+     top_delta="15"
+     width="20" />
 </panel>
-- 
cgit v1.2.3


From 6ec7d6c2e180526c7b61356f063e88c0aab1f5a7 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 24 Nov 2009 12:40:52 -0500
Subject: Changed/moved Teleport Home to Home.
 http://jira.secondlife.com/browse/EXT-2720

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8ab5fb1659..cd11ed764c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -364,17 +364,17 @@
                 <menu_item_call.on_enable
                  function="World.EnableSetHomeLocation" />
             </menu_item_call>
-            <menu_item_call
-             label="Teleport Home"
-             layout="topleft"
-             name="Teleport Home"
-             shortcut="control|shift|H">
-                <menu_item_call.on_click
-                 function="World.TeleportHome" />
-                <menu_item_call.on_enable
-                 function="World.EnableTeleportHome" />
-            </menu_item_call>
         </menu>
+	    <menu_item_call
+	     label="Home"
+	     layout="topleft"
+	     name="Teleport Home"
+	     shortcut="control|shift|H">
+		<menu_item_call.on_click
+		 function="World.TeleportHome" />
+		<menu_item_call.on_enable
+		 function="World.EnableTeleportHome" />
+	    </menu_item_call>
       <menu_item_check
          label="Mini-Map"
          layout="topleft"
-- 
cgit v1.2.3


From 95e123ae41b72a901096aa2c6ab397b177c4d80e Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 24 Nov 2009 13:00:45 -0500
Subject: ext-2557 Buttons should not be bolded -- changes to remove
 font="SansSerifMedium" and "SansSerif" on buttons

---
 indra/newview/skins/default/xui/en/floater_about_land.xml         | 1 -
 indra/newview/skins/default/xui/en/floater_land_holdings.xml      | 2 --
 indra/newview/skins/default/xui/en/floater_preview_gesture.xml    | 4 ----
 indra/newview/skins/default/xui/en/inspect_remote_object.xml      | 3 ---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 1 -
 5 files changed, 11 deletions(-)

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

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 4f1024f56d..8bfd64b3df 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2093,7 +2093,6 @@ Texture:
              width="195" />
             <button
              follows="bottom"
-             font="SansSerifSmall"
              height="16"
              label="Add..."
              label_selected="Add..."
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index e3751f2bd9..06c766f744 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -42,7 +42,6 @@
     </scroll_list>
     <button
      height="23"
-     font="SansSerif"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -53,7 +52,6 @@
      width="80" />
     <button
      height="23"
-     font="SansSerif"
      label="Map"
      label_selected="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 4f3978a5e3..8cc2c91ef5 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -173,7 +173,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Add &gt;&gt;"
      layout="topleft"
      left_pad="10"
@@ -205,7 +204,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Up"
      layout="topleft"
      left_pad="10"
@@ -215,7 +213,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Down"
      layout="topleft"
      left_delta="0"
@@ -225,7 +222,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Remove"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
index 07c684d904..b5f2abf52a 100644
--- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
@@ -71,7 +71,6 @@
   </text>
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Map"
    left="10"
@@ -80,7 +79,6 @@
    width="75" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Block"
    left_pad="5"
@@ -89,7 +87,6 @@
    width="75" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Close"
    right="-10"
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 0ac0521b10..6a61953319 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -319,7 +319,6 @@ Avatars:
      bottom_delta="0"
      enabled_control="EnableVoiceChat"
      follows="left"
-     font="SansSerif"
      halign="center"
      height="20"
      label="Middle Mouse Button"
-- 
cgit v1.2.3


From 58ee415c4972c37256cbd23e2c96cc5f644944d1 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 24 Nov 2009 11:39:22 -0800
Subject: Fixed line editor right padding to work when left padding also
 assigned Eliminated UILineEditorHPad and added 2 px of padding to all custom
 line editors. EXT-1735 Show parcel property icons Review with Leyla pending

---
 .../skins/default/xui/en/alert_line_editor.xml     |  2 +-
 .../default/xui/en/floater_test_line_editor.xml    | 30 +++++++++++++++++++++-
 .../skins/default/xui/en/panel_main_inventory.xml  |  2 +-
 .../skins/default/xui/en/widgets/filter_editor.xml |  2 +-
 .../skins/default/xui/en/widgets/line_editor.xml   |  1 +
 .../default/xui/en/widgets/location_input.xml      |  5 ++--
 .../default/xui/en/widgets/search_combo_box.xml    |  2 +-
 .../skins/default/xui/en/widgets/search_editor.xml |  2 +-
 8 files changed, 38 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
index ab708adb06..97991153d8 100644
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -7,5 +7,5 @@
   ignore_tab="true"
   max_length="254"
   text_pad_right="0"
-  text_pad_left="0"
+  text_pad_left="2"
   mouse_opaque="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index 0531b52e5a..fe6ec91709 100644
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="500"
  layout="topleft"
  name="floater_test_line_editor"
  help_topic="floater_test_line_editor"
@@ -62,6 +62,34 @@
    width="200">
     Disabled red-text line editor
   </line_editor>
+  <line_editor
+   height="20"
+   left_delta="0"
+   name="left_pad_editor"
+   text_pad_left="25"
+   top_pad="10"
+   width="200">
+    25 px left text padding
+  </line_editor>
+  <line_editor
+   height="20"
+   left_delta="0"
+   name="left_pad_editor"
+   text_pad_right="75"
+   top_pad="10"
+   width="200">
+    75 px right text padding
+  </line_editor>
+  <line_editor
+   height="20"
+   left_delta="0"
+   name="left_pad_editor"
+   text_pad_left="25"
+   text_pad_right="75"
+   top_pad="10"
+   width="200">
+    25 px left 75 px right text padding
+  </line_editor>
   <!-- "search_editor" is a specialized line_editor that shows read-only
        help text until the user clicks in the widget. -->
   <search_editor
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 a4149c174f..37d59de66f 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -14,7 +14,7 @@
         Things
     </panel.string>
     <filter_editor
-     text_pad_left="12"
+     text_pad_left="14"
      follows="left|top|right"
 	 font="SanSerif"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index ec8395a7c5..0e34243349 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -2,7 +2,7 @@
 <filter_editor
   clear_button_visible="true"
   search_button_visible="true"
-  text_pad_left="5"
+  text_pad_left="7"
   select_on_focus="true"
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 546fbd9b47..a21e3f2645 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -8,6 +8,7 @@
              ignore_tab="true"
              cursor_color="TextCursorColor"
              text_color="TextFgColor"
+			 text_pad_left="2"
              text_readonly_color="TextFgReadOnlyColor"
              text_tentative_color="TextFgTentativeColor"
 			 highlight_color="EmphasisColor"
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 17b1479ec4..5984634e4c 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -11,6 +11,7 @@
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
+				add_landmark_hpad="8"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -84,7 +85,7 @@
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
     name="damage_text"
-	width="50"
+	width="35"
 	height="18"
 	top="16"
 	halign="right"
@@ -98,7 +99,7 @@
   <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
               scroll_bar_bg_visible="true" />
   <combo_editor name="Combo Text Entry"
-                text_pad_left="20"
+                text_pad_left="22"
                 select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index 56204201ef..c2a70d4b39 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -13,7 +13,7 @@
  <combo_editor
   name="child1"
   select_on_focus="true"
-  text_pad_left="28" 
+  text_pad_left="30" 
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
   background_image_focused="TextField_Search_Active"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 9a79243b03..f644a710b2 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -2,7 +2,7 @@
 <search_editor
   clear_button_visible="false"
   search_button_visible="true"
-  text_pad_left="4" 
+  text_pad_left="6" 
   select_on_focus="true"
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
-- 
cgit v1.2.3


From 724950bac94d1615fe3ea9bd1e9a163473871477 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 24 Nov 2009 15:23:11 -0500
Subject: ext-2557 buttons should not be bolded -- changing default button size
 from SansSerifMedium to SansSerifSmall

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 7c54e618ef..28ed560543 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -15,6 +15,7 @@
         image_color="ButtonImageColor"
         image_color_disabled="ButtonImageColor"
         flash_color="ButtonFlashBgColor"
+	font="SansSerifSmall"
         hover_glow_amount="0.15"
         halign="center"
         scale_image="true">
-- 
cgit v1.2.3


From cb48c896d63f9b84d69fe6ca451ce06b34bd079c Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 24 Nov 2009 15:33:45 -0500
Subject: ext-2591 Missing tool tip on texture icon in New Permissions Floater

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 7ae079f553..53ae24fe3f 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -154,7 +154,7 @@
      image_name="Inv_Texture"
      mouse_opaque="true"
      name="icon_texture"
-     tool_top="Textures"
+     tool_tip="Textures"
      left_pad="2" />
 
     <button
-- 
cgit v1.2.3


From 7f4e9e2cdcf45a2763aad361ecc4e5d30666058a Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 24 Nov 2009 15:54:36 -0500
Subject: Updated to use new button art.
 http://jira.secondlife.com/browse/EXT-2732

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

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

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 41b1f99d41..bb45e51137 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -452,28 +452,38 @@ Maximum animation length is [MAX_LENGTH] seconds.
      width="200" />
     <button
      follows="top|right"
-     height="28"
-     image_selected="button_anim_play_selected.tga"
-     image_unselected="button_anim_play.tga"
+     height="23"
+     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"
      layout="topleft"
      left="10"
      name="play_btn"
      tool_tip="Play/pause your animation"
      top_pad="0"
-     width="28" />
+     width="23" />
     <button
      follows="top|right"
-     height="28"
-     image_selected="button_anim_stop_selected.tga"
-     image_unselected="button_anim_stop.tga"
+     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"
      layout="topleft"
-     left_pad="4"
      name="stop_btn"
      tool_tip="Stop animation playback"
      top_delta="0"
-     width="28" />
+     left_delta="23"
+     width="23" />
     <slider
-     left_pad="0"
+     left_pad="10"
      follows="top|right"
      height="23"
      width="200"
-- 
cgit v1.2.3


From e6ce8d1a06c3bf43342a5c9fa07b39448db4ce2e Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 24 Nov 2009 17:12:28 -0500
Subject:  ext-2814 turn off border on "Press a key to select" floater

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 31d133ff9b..af4fdff044 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- border="true"
+ border="false"
  can_close="false"
  can_minimize="false"
  height="100"
-- 
cgit v1.2.3


From 5e6fb96b0b93c25a92cf7200fe2e4f5fc82f0fc4 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 24 Nov 2009 15:16:27 -0800
Subject: Expose floater close, etc. button images in XML. Renamed
 EFloaterButtons to EFloaterButton Review with Richard pending

---
 indra/newview/skins/default/xui/en/widgets/floater.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 6660fbf1a8..2263866471 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -7,4 +7,19 @@
          bg_alpha_image="Window_Background" 
          background_visible="true"
          background_opaque="false"
-         header_height="25" />
+         header_height="25"
+  close_image="Icon_Close_Foreground"
+  restore_image="Icon_Restore_Foreground"
+  minimize_image="Icon_Minimize_Foreground"
+  tear_off_image="tearoffbox.tga"
+  dock_image="Icon_Dock_Foreground"
+  undock_image="Icon_Undock_Foreground"
+  help_image="Icon_Help_Foreground"
+  close_pressed_image="Icon_Close_Press"
+  restore_pressed_image="Icon_Restore_Press"
+  minimize_pressed_image="Icon_Minimize_Press"
+  tear_off_pressed_image="tearoff_pressed.tga"
+  dock_pressed_image="Icon_Dock_Press"
+  undock_pressed_image="Icon_Undock_Press"
+  help_pressed_image="Icon_Help_Press"
+  />
-- 
cgit v1.2.3


From 123ef91f2d3a402cf17fe8245c5c237167dc5400 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 24 Nov 2009 17:28:02 -0800
Subject: Partial EXT-1735 added "for sale" clickable icon next to landmark
 star

---
 indra/newview/skins/default/xui/en/widgets/location_input.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

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 5984634e4c..90887dead6 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -11,7 +11,7 @@
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
-				add_landmark_hpad="8"
+				add_landmark_hpad="10"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -39,6 +39,15 @@
                           scale_image="false"
 			  top="19"
 			  left="-3" />
+  <for_sale_button
+    name="for_sale_btn"
+    image_unselected="parcel_lght_ForSale"
+    width="22"
+    height="18"
+    follows="right|top"
+    scale_image="false"
+    top="21"
+    />
   <voice_icon
     name="voice_icon"
     width="22"
-- 
cgit v1.2.3


From 458430be918500e1c93961a2d959542b3987f6a6 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 24 Nov 2009 22:13:10 -0800
Subject: Removed include llnotifications.h from llfloater.h trying to speed
 builds Fixed many other includes related to this file. Cleaned out
 llfloatertestlistview to be an empty test floater.

---
 .../default/xui/en/floater_test_list_view.xml      | 24 +---------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
index 1d2086d9bc..247c705687 100644
--- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
@@ -7,27 +7,5 @@
  name="floater_test_list_view"
  help_topic="floater_test_list_view"
  width="400">
-    <list_view
-     height="300"
-     left="10"
-     name="test_list_view"
-     top="28"
-     width="300" />
-  <button
-    name="test_1_btn"
-    label="Test 1"
-    top="350"
-    left="10"
-    height="20"
-    width="80"
-    commit_callback.function="TestListView.Test1" />
-  <button
-    name="test_2_btn"
-    label="Test 2"
-    top_delta="0"
-    left_pad="10"
-    height="20"
-    width="80"
-    commit_callback.function="TestListView.Test2" />
-
+ <!-- intentionally empty -->
 </floater>
-- 
cgit v1.2.3


From cbc0783cd19f096b454cabe47174c97d3d42842b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 25 Nov 2009 01:15:50 -0800
Subject: Created lightweight LLNotificationsUtil::add(), switched most alerts
 to use it Cuts number of includes of llnotifications.h from 300+ to 40.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 indra/newview/skins/default/xui/en/strings.xml       | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d1bcb8f60..ca749406d4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5806,13 +5806,6 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 - Your system memory does not meet the minimum requirements.
   </global>
 
-  <global name="PermYes">
-Yes
-  </global>
-
-  <global name="PermNo">
-No
-  </global>
 <!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed
 	whenever the server string changes -->
    <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 90fb3a6bf9..3c03f0a8cf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1819,6 +1819,9 @@ this texture in your inventory
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
+	<!-- Inventory permissions -->
+	<string name="PermYes">Yes</string>
+	<string name="PermNo">No</string>
 
 	<!-- Gestures labels -->
     <!-- use value="" because they have preceding spaces -->
-- 
cgit v1.2.3


From ccabcca5fe80c6ee376ec538285f52bbb4f87a78 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 25 Nov 2009 01:42:09 -0800
Subject: Nudge Parabuild, Mac build choked for some reason

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 4bbd561882..1326e9f739 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,6 +5,6 @@
  name="floater_aaa"
  can_resize="true" 
  width="1024">
- <string name="Nudge Parabuild">2</string>
+ <string name="Nudge Parabuild">3</string>
   <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
-- 
cgit v1.2.3


From 446702d7620b124b1f34599e89c5fc6d12ec390d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 25 Nov 2009 02:06:34 -0800
Subject: Nudge parabuild again

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 1326e9f739..0c64408b50 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,6 +5,6 @@
  name="floater_aaa"
  can_resize="true" 
  width="1024">
- <string name="Nudge Parabuild">3</string>
+ <string name="Nudge Parabuild">4</string>
   <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
-- 
cgit v1.2.3


From 543a2e6f9b839819b594bf6814bb29a42cc757e0 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 25 Nov 2009 15:20:11 -0800
Subject: EXT-2855 Strings.xml has entries which are not actually user-visible

---
 indra/newview/skins/default/xui/en/strings.xml | 99 +++++++++++---------------
 1 file changed, 40 insertions(+), 59 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3c03f0a8cf..4b727e36ab 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2263,22 +2263,17 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Attached">Attached</string>
 <string name="Attached Earlobes">Attached Earlobes</string>
 
-<string name="Back Bangs">Back Bangs</string>
-<string name="Back Bangs Down">Back Bangs Down</string>
-<string name="Back Bangs Up">Back Bangs Up</string>
+
 <string name="Back Fringe">Back Fringe</string>
-<string name="Back Hair">Back Hair</string>
-<string name="Back Hair Down">Back Hair Down</string>
-<string name="Back Hair Up">Back Hair Up</string>
+
 <string name="Baggy">Baggy</string>
 <string name="Bangs">Bangs</string>
-<string name="Bangs Down">Bangs Down</string>
-<string name="Bangs Up">Bangs Up</string>
+
 <string name="Beady Eyes">Beady Eyes</string>
 <string name="Belly Size">Belly Size</string>
 <string name="Big">Big</string>
 <string name="Big Butt">Big Butt</string>
-<string name="Big Eyeball">Big Eyeball</string>
+
 <string name="Big Hair Back">Big Hair: Back</string>
 <string name="Big Hair Front">Big Hair: Front</string>
 <string name="Big Hair Top">Big Hair: Top</string>
@@ -2348,20 +2343,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
 
 <string name="Corner Down">Corner Down</string>
-<string name="Corner Normal">Corner Normal</string>
+
 <string name="Corner Up">Corner Up</string>
 <string name="Creased">Creased</string>
 <string name="Crooked Nose">Crooked Nose</string>
-<string name="Cropped Hair">Cropped Hair</string>
+
 <string name="Cuff Flare">Cuff Flare</string>
 <string name="Dark">Dark</string>
 <string name="Dark Green">Dark Green</string>
 <string name="Darker">Darker</string>
 <string name="Deep">Deep</string>
 <string name="Default Heels">Default Heels</string>
-<string name="Default Toe">Default Toe</string>
+
 <string name="Dense">Dense</string>
-<string name="Dense hair">Dense hair</string>
+
 <string name="Double Chin">Double Chin</string>
 <string name="Downturned">Downturned</string>
 <string name="Duffle Bag">Duffle Bag</string>
@@ -2377,7 +2372,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Eye Pop">Eye Pop</string>
 <string name="Eye Size">Eye Size</string>
 <string name="Eye Spacing">Eye Spacing</string>
-<string name="Eyeball Size">Eyeball Size</string>
+
 <string name="Eyebrow Arc">Eyebrow Arc</string>
 <string name="Eyebrow Density">Eyebrow Density</string>
 
@@ -2388,27 +2383,22 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Eyelash Length">Eyelash Length</string>
 <string name="Eyeliner">Eyeliner</string>
 <string name="Eyeliner Color">Eyeliner Color</string>
-<string name="Eyes Back">Eyes Back</string>
+
 <string name="Eyes Bugged">Eyes Bugged</string>
-<string name="Eyes Forward">Eyes Forward</string>
-<string name="Eyes Long Head">Eyes Long Head</string>
+
+
 <string name="Eyes Shear Left Up">Eyes Shear Left Up</string>
 <string name="Eyes Shear Right Up">Eyes Shear Right Up</string>
-<string name="Eyes Short Head">Eyes Short Head</string>
-<string name="Eyes Spread">Eyes Spread</string>
-<string name="Eyes Sunken">Eyes Sunken</string>
-<string name="Eyes Together">Eyes Together</string>
+
+
+
+
 <string name="Face Shear">Face Shear</string>
 <string name="Facial Definition">Facial Definition</string>
 <string name="Far Set Eyes">Far Set Eyes</string>
-<string name="Fat">Fat</string>
-<string name="Fat Head">Fat Head</string>
+
 <string name="Fat Lips">Fat Lips</string>
-<string name="Fat Lower">Fat Lower</string>
-<string name="Fat Lower Lip">Fat Lower Lip</string>
-<string name="Fat Torso">Fat Torso</string>
-<string name="Fat Upper">Fat Upper</string>
-<string name="Fat Upper Lip">Fat Upper Lip</string>
+
 <string name="Female">Female</string>
 <string name="Fingerless">Fingerless</string>
 <string name="Fingers">Fingers</string>
@@ -2421,12 +2411,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Forehead Angle">Forehead Angle</string>
 <string name="Forehead Heavy">Forehead Heavy</string>
 <string name="Freckles">Freckles</string>
-<string name="Front Bangs Down">Front Bangs Down</string>
-<string name="Front Bangs Up">Front Bangs Up</string>
+
 <string name="Front Fringe">Front Fringe</string>
-<string name="Front Hair">Front Hair</string>
-<string name="Front Hair Down">Front Hair Down</string>
-<string name="Front Hair Up">Front Hair Up</string>
+
 <string name="Full Back">Full Back</string>
 <string name="Full Eyeliner">Full Eyeliner</string>
 <string name="Full Front">Full Front</string>
@@ -2525,7 +2512,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Long Ponytail">Long Ponytail</string>
 <string name="Long Torso">Long Torso</string>
 <string name="Long arms">Long arms</string>
-<string name="Longcuffs">Longcuffs</string>
+
 
 <string name="Loose Pants">Loose Pants</string>
 <string name="Loose Shirt">Loose Shirt</string>
@@ -2585,7 +2572,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="No Blush">No Blush</string>
 <string name="No Eyeliner">No Eyeliner</string>
 <string name="No Eyeshadow">No Eyeshadow</string>
-<string name="No Heels">No Heels</string>
+
 <string name="No Lipgloss">No Lipgloss</string>
 <string name="No Lipstick">No Lipstick</string>
 <string name="No Part">No Part</string>
@@ -2606,7 +2593,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Nostril Division">Nostril Division</string>
 <string name="Nostril Width">Nostril Width</string>
 
-<string name="Old">Old</string>
+
 <string name="Opaque">Opaque</string>
 <string name="Open">Open</string>
 <string name="Open Back">Open Back</string>
@@ -2643,7 +2630,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Platform Width">Platform Width</string>
 <string name="Pointy">Pointy</string>
 <string name="Pointy Heels">Pointy Heels</string>
-<string name="Pointy Toe">Pointy Toe</string>
+
 <string name="Ponytail">Ponytail</string>
 <string name="Poofy Skirt">Poofy Skirt</string>
 <string name="Pop Left Eye">Pop Left Eye</string>
@@ -2652,30 +2639,30 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Puffy Eyelids">Puffy Eyelids</string>
 <string name="Rainbow Color">Rainbow Color</string>
 <string name="Red Hair">Red Hair</string>
-<string name="Red Skin">Red Skin</string>
+
 <string name="Regular">Regular</string>
-<string name="Regular Muscles">Regular Muscles</string>
+
 <string name="Right Part">Right Part</string>
 <string name="Rosy Complexion">Rosy Complexion</string>
 <string name="Round">Round</string>
-<string name="Round Forehead">Round Forehead</string>
+
 <string name="Ruddiness">Ruddiness</string>
 <string name="Ruddy">Ruddy</string>
 <string name="Rumpled Hair">Rumpled Hair</string>
 <string name="Saddle Bags">Saddle Bags</string>
-<string name="Saddlebags">Saddlebags</string>
-<string name="Scrawny">Scrawny</string>
+
+
 <string name="Scrawny Leg">Scrawny Leg</string>
 <string name="Separate">Separate</string>
-<string name="Shading">Shading</string>
-<string name="Shadow hair">Shadow hair</string>
+
+
 <string name="Shallow">Shallow</string>
 <string name="Shear Back">Shear Back</string>
 <string name="Shear Face">Shear Face</string>
 <string name="Shear Front">Shear Front</string>
-<string name="Shear Left">Shear Left</string>
+
 <string name="Shear Left Up">Shear Left Up</string>
-<string name="Shear Right">Shear Right</string>
+
 <string name="Shear Right Up">Shear Right Up</string>
 <string name="Sheared Back">Sheared Back</string>
 <string name="Sheared Front">Sheared Front</string>
@@ -2699,16 +2686,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Short Torso">Short Torso</string>
 <string name="Short hips">Short hips</string>
 <string name="Shoulders">Shoulders</string>
-<string name="Side Bangs">Side Bangs</string>
-<string name="Side Bangs Down">Side Bangs Down</string>
-<string name="Side Bangs Up">Side Bangs Up</string>
+
 <string name="Side Fringe">Side Fringe</string>
 <string name="Sideburns">Sideburns</string>
 
 <string name="Sides Hair">Sides Hair</string>
 <string name="Sides Hair Down">Sides Hair Down</string>
 <string name="Sides Hair Up">Sides Hair Up</string>
-<string name="Skinny">Skinny</string>
+
 <string name="Skinny Neck">Skinny Neck</string>
 <string name="Skirt Fit">Skirt Fit</string>
 <string name="Skirt Length">Skirt Length</string>
@@ -2729,7 +2714,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Smooth Hair">Smooth Hair</string>
 <string name="Socks Length">Socks Length</string>
 
-<string name="Some">Some</string>
+
 <string name="Soulpatch">Soulpatch</string>
 
 <string name="Sparse">Sparse</string>
@@ -2737,24 +2722,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Square">Square</string>
 <string name="Square Toe">Square Toe</string>
 <string name="Squash Head">Squash Head</string>
-<string name="Squash/Stretch Head">Squash/Stretch Head</string>
+
 <string name="Stretch Head">Stretch Head</string>
 <string name="Sunken">Sunken</string>
 <string name="Sunken Chest">Sunken Chest</string>
 <string name="Sunken Eyes">Sunken Eyes</string>
 <string name="Sweep Back">Sweep Back</string>
 <string name="Sweep Forward">Sweep Forward</string>
-<string name="Swept Back">Swept Back</string>
-<string name="Swept Back Hair">Swept Back Hair</string>
-<string name="Swept Forward">Swept Forward</string>
-<string name="Swept Forward Hair">Swept Forward Hair</string>
+
 <string name="Tall">Tall</string>
 <string name="Taper Back">Taper Back</string>
 <string name="Taper Front">Taper Front</string>
 <string name="Thick Heels">Thick Heels</string>
 <string name="Thick Neck">Thick Neck</string>
 <string name="Thick Toe">Thick Toe</string>
-<string name="Thickness">Thickness</string>
+
 <string name="Thin">Thin</string>
 <string name="Thin Eyebrows">Thin Eyebrows</string>
 <string name="Thin Lips">Thin Lips</string>
@@ -2765,8 +2747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Tight Shirt">Tight Shirt</string>
 <string name="Tight Skirt">Tight Skirt</string>
 <string name="Tight Sleeves">Tight Sleeves</string>
-<string name="Tilt Left">Tilt Left</string>
-<string name="Tilt Right">Tilt Right</string>
+
 <string name="Toe Shape">Toe Shape</string>
 <string name="Toe Thickness">Toe Thickness</string>
 <string name="Torso Length">Torso Length</string>
-- 
cgit v1.2.3


From 5cbf58958d61d19d02aedb66ace008293db14d69 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 25 Nov 2009 15:26:34 -0800
Subject: DEV-40008 retract (some of) the broken formatting in the foreign
 languages: - use the new [LOCALAMOUNT] variable for floater_buy_currency.xml
 - fix the French floater_world_map.xml, floater_animation_preview.xml

---
 .../skins/default/xui/da/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/de/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/es/floater_buy_currency.xml  |  4 +-
 .../default/xui/fr/floater_animation_preview.xml   | 31 +++++++-------
 .../skins/default/xui/fr/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/fr/floater_world_map.xml     | 47 ++++++++++------------
 .../skins/default/xui/it/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/ja/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/nl/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/pl/floater_buy_currency.xml  |  4 +-
 .../skins/default/xui/pt/floater_buy_currency.xml  |  4 +-
 11 files changed, 55 insertions(+), 59 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index a2b6dec91c..d1fca8984d 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		for ca. US$ [USD]
+		for ca. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Henter data...
@@ -63,6 +63,6 @@ og prøv igen.
 	<button label="Annullér" name="cancel_btn" />
 	<button label="Køb" name="buy_btn" />
 	<string name="buy_currency">
-		Køb L$ [LINDENS] for ca. US$ [USD]
+		Køb L$ [LINDENS] for ca. [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 05750a1782..56b7868c33 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		für ca. [USD] US$
+		für ca. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Daten werden geladen...
@@ -63,6 +63,6 @@ Kaufen Sie mehr.
 	<button label="Kaufen" name="buy_btn" />
 	<button label="Abbrechen" name="cancel_btn" />
 	<text name="buy_currency">
-		[LINDENS] L$ für ca. [USD] US$ kaufen
+		[LINDENS] L$ für ca. [LOCALAMOUNT] kaufen
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index af542acbce..eb25493adc 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est" width="138" left_delta="68">
-		L$  por, aprox., [USD] US$
+		por, aprox., [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Obteniendo los datos...
@@ -63,6 +63,6 @@ Aumente la cantidad a comprar.
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Comprar" name="buy_btn"/>
 	<string name="buy_currency">
-		Compre [LINDENS] L$ por, aprox., [USD] US$
+		Compre [LINDENS] L$ por, aprox., [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index 4417006fc6..a4ad14294e 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -114,12 +114,13 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 	</text>
 	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
 	<check_box label="Boucle" left="6" name="loop_check" tool_tip="Joue cette animation en boucle."/>
-	<spinner label="Début (%)" label_width="55" left="76" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart." width="105"/>
-	<spinner label="Fin (%)" left="195" name="loop_out_point" tool_tip="Définit le moment de l&apos;animation où la boucle finit."/>
-	<text name="hand_label" width="110">
-		Mouvement de main
+	<spinner label="Début (%)" label_width="65" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart." width="105"/>
+	<spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l&apos;animation où la boucle finit."/>
+	<text name="hand_label">
+		Mouvement de
+main
 	</text>
-	<combo_box label="" left_delta="116" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation" width="124">
+	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation">
 		<combo_box.item label="Doigts écartés" name="Spread"/>
 		<combo_box.item label="Détendues" name="Relaxed"/>
 		<combo_box.item label="Pointer (les deux)" name="PointBoth"/>
@@ -137,7 +138,7 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 	<text name="emote_label">
 		Expression
 	</text>
-	<combo_box label="" left_delta="116" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation." width="124">
+	<combo_box label="" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation.">
 		<combo_box.item label="None]" name="[None]"/>
 		<combo_box.item label="Aaaaah" name="Aaaaah"/>
 		<combo_box.item label="Effrayé" name="Afraid"/>
@@ -159,27 +160,25 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 		<combo_box.item label="Clin d&apos;œil" name="Wink"/>
 		<combo_box.item label="Soucis" name="Worry"/>
 	</combo_box>
-	<text name="preview_label" width="110">
-		Prévisualiser pendant
+	<text name="preview_label">
+		Prévisualiser
+pendant
 	</text>
-	<combo_box label="" left_delta="116" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." width="124">
+	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
 		<combo_box.item label="Debout" name="Standing"/>
 		<combo_box.item label="En train de marcher" name="Walking"/>
 		<combo_box.item label="Assis" name="Sitting"/>
 		<combo_box.item label="En train de voler" name="Flying"/>
 	</combo_box>
-	<spinner label="Transition 
-début (s)" label_width="65" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
-	<spinner label="Transition 
-fin (s)" label_width="65" left="160" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement." width="125"/>
-	<button bottom_delta="-48" label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation."/>
+	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
+	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement." />
+	<button label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation."/>
 	<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		Impossible de lire le fichier d&apos;animation.
 
-Nous recommandons les fichiers BVH extraits de
-Poser 4.
+Nous recommandons les fichiers BVH extraits de Poser 4.
 	</text>
 	<button label="Annuler" name="cancel_btn"/>
 	<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 9112d30be2..603b7587b4 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est" width="138" left_delta="68">
-		L$  pour environ [USD] US$
+		pour environ [LOCALAMOUNT]
 	</text>
 	<text name="getting_data" width="138">
 		Obtention des données...
@@ -64,6 +64,6 @@ Veuillez saisir un montant plus élevé.
 	<button label="Acheter" name="buy_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
 	<string name="buy_currency">
-		Acheter [LINDENS] L$ pour environ [USD] US$
+		Acheter [LINDENS] L$ pour environ [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 1f76202dee..ddb868b04a 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,71 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="CARTE DU MONDE">
-	<tab_container name="maptab" width="955">
-		<panel label="Objets" name="objects_mapview" width="953"/>
-		<panel label="Terrain" name="terrain_mapview" width="953"/>
-	</tab_container>
-	<icon left="973" name="self"/>
+	<panel name="objects_mapview" width="542"/>
+	<icon name="self" left="-270"/>
 	<text name="you_label">
 		Vous
 	</text>
-	<icon left="1033" name="home"/>
+	<icon name="home"/>
 	<text name="home_label">
 		Domicile
 	</text>
-	<icon left="973" name="square2"/>
+	<icon name="square2" left="-270"/>
 	<text name="auction_label">
 		Terrain aux enchères
 	</text>
-	<icon left="1105" name="square"/>
+	<icon name="square" left_delta="130"/>
 	<text name="land_for_sale_label">
 		Terrain à vendre
 	</text>
-	<button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
-	<icon left="977" name="person"/>
+	<button left="-120" width="108" label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+	<icon left="-262" name="person"/>
 	<check_box label="Résident" name="people_chk"/>
-	<icon left="973" name="infohub"/>
+	<icon left="-266" name="infohub"/>
 	<check_box label="Infohub" name="infohub_chk"/>
-	<icon left="973" name="telehub"/>
+	<icon left="-266" name="telehub"/>
 	<check_box label="Téléhub" name="telehubchk"/>
-	<icon left="973" name="landforsale"/>
+	<icon left="-266" name="landforsale"/>
 	<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
-	<text name="events_label" left="1099">
+	<text name="events_label" left="-144">
 		Événements :
 	</text>
-	<icon left="1121" name="event"/>
+	<icon left="-132" name="event"/>
 	<check_box label="PG" name="event_chk"/>
-	<icon left="1121" name="events_mature_icon"/>
+	<icon left="-132" name="events_mature_icon"/>
 	<check_box label="Mature" name="event_mature_chk"/>
-	<icon left="1121" name="events_adult_icon"/>
+	<icon left="-132" name="events_adult_icon"/>
 	<check_box label="Adult" name="event_adult_chk"/>
-	<icon left="973" name="avatar_icon"/>
+	<icon left="-270" name="avatar_icon"/>
 	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
 		<combo_box.item name="item1" label="Amis connectés" />
 	</combo_box>
-	<icon left="973" name="landmark_icon"/>
+	<icon left="-270" name="landmark_icon"/>
 	<combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
 		<combo_box.item name="item1" label="Repères" />
 	</combo_box>
-	<icon left="973" name="location_icon"/>
+	<icon left="-270" name="location_icon"/>
 	<line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155"/>
 	<button label="Rechercher" label_selected="&gt;" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
-	<text left="973" name="search_label">
+	<text left="-270" name="search_label">
 		Résultats de la recherche :
 	</text>
-	<scroll_list left="973" name="search_results" width="252">
+	<scroll_list left="-270" name="search_results" width="252">
 		<column label="" name="icon"/>
 		<column label="" name="sim_name"/>
 	</scroll_list>
-	<text left="973" name="location_label">
+	<text left="-270" name="location_label">
 		Emplacement :
 	</text>
-	<spinner left="1078" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
+	<spinner left_delta="100" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
 	<spinner name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
 	<spinner name="spin z" tool_tip="Coordonnées des Z du lieu à afficher sur la carte"/>
 	<button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
 	<button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/>
 	<button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
 	<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar" width="165"/>
-	<button label="Copier la SLurl dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copier l&apos;emplacement actuel comme SLurl pour l&apos;utiliser sur le Web." width="262"/>
+	<button label="Copier la SLurl dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copier l&apos;emplacement actuel comme SLurl pour l&apos;utiliser sur le Web." />
 	<slider label="Zoom" left="-270" name="zoom slider"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index 6b881683f1..a22850bc4b 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		L$  per circa [USD]US$
+		per circa [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Dati in ricezione...
@@ -64,6 +64,6 @@ Devi aumentare l&apos;importo da acquistare.
 	<button label="Cancella" name="cancel_btn"/>
 	<button label="Acquista" name="buy_btn"/>
 	<string name="buy_currency">
-		acquistare [LINDENS] L$ per circa [USD] US$
+		acquistare [LINDENS]L$ per circa [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 9d5aea612b..35516301fc 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		約US$ [USD]
+		約[LOCALAMOUNT]
 	</text>
 	<text name="getting_data" left_delta="3">
 		データを取得しています...
@@ -63,6 +63,6 @@
 	<button label="購入" name="buy_btn" />
 	<button label="取り消し" name="cancel_btn" />
 	<text name="buy_currency">
-		約US$ [USD]でL$ [LINDENS]を購入
+		約[LOCALAMOUNT]でL$ [LINDENS]を購入
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_buy_currency.xml b/indra/newview/skins/default/xui/nl/floater_buy_currency.xml
index b6fc743abe..6ee5cc5341 100644
--- a/indra/newview/skins/default/xui/nl/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/nl/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est" left_delta="80">
-		voor ong. US$ [USD]
+		voor ong. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Data ophalen…
@@ -63,6 +63,6 @@ Verhoog de hoeveelheid die gekocht moet worden.
 	<button label="Annuleren" name="cancel_btn"/>
 	<button label="Kopen" name="buy_btn"/>
 	<string name="buy_currency">
-		Koop L$ [LINDENS] voor ong. US$ [USD]
+		Koop L$ [LINDENS] voor ong. [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
index b0b8935433..5e59482883 100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		L$ za [USD]US$
+		za [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Otrzymywanie danych...
@@ -64,6 +64,6 @@ Proszę zwiększyć ilość.
 	<button label="Anuluj" name="cancel_btn" />
 	<button label="Kup" name="buy_btn" />
 	<string name="buy_currency">
-		Kup [LINDENS]L$ za [USD]US$
+		Kup [LINDENS]L$ za [LOCALAMOUNT]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index ceeb070c4e..aac8438fdc 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est" left_delta="72">
-		por aproxim. US$ [USD]
+		por aproxim. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
 		Obtendo dados...
@@ -63,6 +63,6 @@ Aumente a quantidade de compra.
 	<button label="Fechar" name="cancel_btn"/>
 	<button label="Adquirir" name="buy_btn"/>
 	<string name="buy_currency">
-		Comprar L$ [LINDENS] por aproximadamente US$ [USD]
+		Comprar L$ [LINDENS] por aproxim. [LOCALAMOUNT]
 	</string>
 </floater>
-- 
cgit v1.2.3