From 1d9237e299e152c5a58f89be3da2f40e1e2d7338 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Tue, 19 Jan 2010 19:49:39 +0200
Subject: fixed bug EXT-4445 [BSI] Can start an IM session with myself and
 offer items via context menu in group chat participants list

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 31263fbea8..805ffbae66 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -47,6 +47,9 @@
      name="IM">
         <menu_item_call.on_click
          function="Avatar.IM" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_im" />
     </menu_item_call>
     <menu_item_call
      label="Call"
@@ -65,6 +68,9 @@
      name="Share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      label="Pay"
-- 
cgit v1.2.3


From 138604c2e02f6c78be587ff1e253c31a10ee0301 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 19 Jan 2010 20:17:37 +0200
Subject: Fixed bug EXT-4471 (Group Profile Group Founder not Clickable).

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 8188048821..5b0a7107e4 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -88,6 +88,7 @@ background_visible="true"
      initial_value="(retrieving)"
      layout="topleft"
      left_delta="0"
+     link="true"
      name="founder_name"
      top_pad="2"
      use_ellipses="true"
-- 
cgit v1.2.3


From e57ab1e22500fdf4184fe2b2c9733984496dea53 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 19 Jan 2010 20:40:17 +0200
Subject: Made name boxes displaying an avatar's partner clickable and have a
 proper initial value.

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

(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 172cf18fc4..8268937e7f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -304,8 +304,10 @@
             <name_box
              follows="left|top|right"
              height="30"
+             initial_value="(retrieving)"
              layout="topleft"
              left="0"
+             link="true"
              name="partner_text"
              top="0"
              width="285"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 27c1af1860..2659156ba8 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -267,6 +267,7 @@
               <name_box
                follows="left|top"
                height="10"
+               initial_value="(retrieving)"
                layout="topleft"
                left="0"
                link="true"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 597b6410cd..2b907ed251 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -247,6 +247,7 @@
               <name_box
                follows="left|top"
                height="10"
+               initial_value="(retrieving)"
                layout="topleft"
                left="0"
                link="true"
-- 
cgit v1.2.3


From 0650dc0b0a71888cad1efc3727b70fd963ad23c4 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 19 Jan 2010 13:52:59 -0500
Subject: EXT-4412 swap order of tabs on outfit editor panel

Swapping back so "my outfits" is displayed first. Also changing code so that
this change can be made in the future as a XUI-only change.

Reviewed by Vir.
---
 .../default/xui/en/panel_outfits_inventory.xml     | 42 +++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index fd540bdc7e..8895484326 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -21,22 +21,8 @@
      halign="center"
      width="313">
          <inventory_panel
-     follows="all"
- background_visible="true"
- background_opaque="true"
-        label="WEARING"
-        help_topic="now_wearing_tab"
-        allow_multi_select="true"
-        border="false"
-        left="0"
-        top="0"
-        mouse_opaque="true"
-        name="cof_accordionpanel"
-        start_folder="Current Outfit"
-     width="313" />
-         <inventory_panel
- background_visible="true"
- background_opaque="true"
+           background_visible="true"
+           background_opaque="true"
            label="MY OUTFITS"
            help_topic="my_outfits_tab"
            allow_multi_select="true"
@@ -48,6 +34,20 @@
            mouse_opaque="true"
            name="outfitslist_tab"
            start_folder="My Outfits" /> 
+         <inventory_panel
+           follows="all"
+           background_visible="true"
+           background_opaque="true"
+           label="WEARING"
+           help_topic="now_wearing_tab"
+          allow_multi_select="true"
+           border="false"
+           left="0"
+           top="0"
+           mouse_opaque="true"
+           name="cof_accordionpanel"
+           start_folder="Current Outfit"
+           width="313" />
    </tab_container>
 	<panel
 	  background_visible="true"
@@ -103,5 +103,15 @@
        top="26"
       tool_tip="Wear selected outfit"
       width="120" />
+	 <button
+	  follows="bottom|left"
+		height="23" 
+		label="M" 
+		layout="topleft"
+        right="-140"
+		name="look_edit_btn"
+        top="26"
+        visible="false" 
+		width="20" />
 	 </panel>
 </panel>
-- 
cgit v1.2.3


From 85c97cab02b0f2ba89b7af05c14a69ff90ffa25e Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 19 Jan 2010 22:03:55 +0200
Subject: Fixed normal bug  Bug EXT-4444 ([BSI] Buy L$ art in top bar is
 clipped when Fav and Navbar are hidden).

- Changed vertical alignment of "Buy L$" and some other elements in status bar via xml.

--HG--
branch : product-engine
---
 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 bfca2f2e46..7a6089c74e 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -53,7 +53,7 @@
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
-     top="5"
+     top="3"
      width="100" />
     <button
      auto_resize="true"
@@ -71,7 +71,7 @@
      name="buyL"
      pad_right="20px"
      tool_tip="Click to buy more L$"
-     top="5"
+     top="2"
      width="100" />
     <text
      type="string"
@@ -80,7 +80,7 @@
      follows="right|bottom"
      halign="right"
      height="16"
-     top="7"
+     top="5"
      layout="topleft"
      left_pad="0"
      name="TimeText"
@@ -96,7 +96,7 @@
      image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="18"
-     top="4"
+     top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-- 
cgit v1.2.3


From 1e9436c3a464392d4a338ab8b9f4ad8e7aa715ba Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 19 Jan 2010 12:28:25 -0800
Subject: EXT-4338  Design alert for Outfit save to help users understand what
 is happening

---
 .../skins/default/xui/en/floater_outfit_save_as.xml | 21 ++++++++++-----------
 .../default/xui/en/floater_wearable_save_as.xml     | 18 ++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
index c3d84de9a7..16079b30cb 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- border="true"
  can_close="false"
  can_minimize="false"
  height="100"
@@ -9,7 +7,7 @@
  name="modal container"
  width="240">
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
@@ -18,7 +16,7 @@
      top="70"
      width="82" />
     <button
-     height="20"
+     height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
@@ -30,14 +28,15 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="16"
+     height="30"
      layout="topleft"
      left="20"
+     word_wrap="true"
      name="Save item as:"
      top="10"
      width="200">
-        Save outfit as:
+        Save what I'm wearing
+as a new Outfit:
     </text>
     <line_editor
      type="string"
@@ -45,15 +44,15 @@
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left_delta="0"
+     show_text_as_tentative="false"
+     top_pad="0"
      max_length="63"
      name="name ed"
-     top_pad="4"
      width="200">
-        [DESC]
+        [DESC] (new)
     </line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
index 9a95e3dfef..b4b57f2dbc 100644
--- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- border="true"
+ legacy_header_height="0"
  can_close="false"
  can_minimize="false"
  height="100"
@@ -9,7 +8,7 @@
  name="modal container"
  width="240">
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
@@ -18,7 +17,7 @@
      top="70"
      width="82" />
     <button
-     height="20"
+     height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
@@ -30,14 +29,14 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="16"
+     height="30"
      layout="topleft"
+     word_wrap="true"
      left="20"
      name="Save item as:"
      top="10"
      width="200">
-        Save item as:
+        Save item to my inventory as:
     </text>
     <line_editor
      type="string"
@@ -45,14 +44,13 @@
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left_delta="0"
      max_length="63"
      name="name ed"
-     top_pad="4"
+     top_pad="0"
      width="200">
         New [DESC]
     </line_editor>
-- 
cgit v1.2.3


From cd5cd11ccbd1ad13afd43c045735f01dbc994a80 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 19 Jan 2010 12:30:07 -0800
Subject: L10N: harmless commit to test the Viewer Localization Tool, which has
 been broken for 80 days.

---
 indra/newview/skins/default/xui/en/floater_aaa.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_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index cb4cbd229a..0b48ba9321 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -18,7 +18,7 @@
  single_instance="true" 
  width="320">
   <string name="nudge_parabuild">Nudge 1</string>
-  <string name="test_the_vlt">This string is extracted.</string>
+  <string name="test_the_vlt">This string CHANGE is extracted.</string>
   <chat_history
    allow_html="true"
    bg_readonly_color="ChatHistoryBgColor"
-- 
cgit v1.2.3


From cdae00e7f0afd463ad84bea07bdb1e6bd2d27814 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 19 Jan 2010 16:01:49 -0800
Subject: better fix of EXT-299 "Mute" still showing in avatar Context menu,
 although label says "Block" The original fix at r6543 created a duplicate
 node, which breaks localization. Renaming that new node with a unique name=.

---
 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 02dc507781..b378944e48 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2170,7 +2170,7 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
-  <string name="MuteObject">Block</string>
+  <string name="MuteObject2">Block</string>
   <string name="MuteAvatar">Block</string>
   <string name="UnmuteObject">Unblock</string>
   <string name="UnmuteAvatar">Unblock</string>
-- 
cgit v1.2.3


From 4e4561cb32f5cdb3224e011c3e086c14d6ad97a2 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 19 Jan 2010 16:12:43 -0800
Subject: DEV-39252 fix any duplicate name= elements in viewer-2-0. Duplicates
 break localization.

---
 indra/newview/skins/default/xui/en/floater_world_map.xml | 4 ++--
 indra/newview/skins/default/xui/en/menu_viewer.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 8904d4f49c..65c9c2a8fa 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -77,7 +77,7 @@
      top_delta="6"
      left_pad="5"
      layout="topleft"
-     name="person_label"
+     name="me_label"
      width="90">
         Me
     </text>
@@ -196,7 +196,7 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="auction_label"
+     name="by_owner_label"
      top_delta="3"
      width="100">
        by owner
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 45100eb1ff..21fe2bb242 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -293,7 +293,7 @@
            create_jump_keys="true"
            label="Show"
            layout="topleft"
-           name="Land"
+           name="LandShow"
            tear_off="true">
          <menu_item_check
          label="Move Controls"
-- 
cgit v1.2.3