From fe71dd340ab396b93bde45df438041af5d85fd47 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 1 Feb 2010 15:10:19 -0800
Subject: Merge giab-viewer-trunk 2497, general merge of more secapi stuff as
 well as certificate handling stuff. Grid manager as well

---
 indra/newview/skins/default/xui/en/panel_login.xml | 55 +++++++---------------
 1 file changed, 17 insertions(+), 38 deletions(-)

(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 6187b8f1e2..6b6013a6ee 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -47,19 +47,19 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="695"
-min_width="695"
+width="775"
+min_width="775"
 user_resize="false"
 height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-name="first_name_text"
+name="username_text"
 top="20"
 left="20"
 width="150">
-First name:
+Username:
 </text>
 <line_editor
 follows="left|bottom"
@@ -68,31 +68,11 @@ height="22"
 label="First"
 left_delta="0"
 max_length="31"
-name="first_name_edit"
+name="username_edit"
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] First Name"
+tool_tip="[SECOND_LIFE] Username"
 top_pad="0"
-   width="135" />
-  <text
-   follows="left|bottom"
-   font="SansSerifSmall"
-   height="16"
-   left_pad="8"
-   name="last_name_text"
-   top="20"
-   width="150">
-    Last name:   </text>
-<line_editor
-follows="left|bottom"
-handle_edit_keys_directly="true"
-height="22"
-label="Last"
-max_length="31"
-name="last_name_edit"
-select_on_focus="true"
-tool_tip="[SECOND_LIFE] Last Name"
-  top_pad="0"
-  width="135" />
+width="150" />
 <text
 follows="left|bottom"
 font="SansSerifSmall"
@@ -152,18 +132,7 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<combo_box
-allow_text_entry="true"
-font="SansSerifSmall"
-   follows="left|right|bottom"
-   height="23"
-layout="topleft"
-top_pad="2"
-name="server_combo"
-width="135"
-  visible="false" />
 <button
-  follows="left|bottom"
   height="23"
   image_unselected="PushButton_On"
   image_selected="PushButton_On_Selected"
@@ -174,6 +143,16 @@ width="135"
   name="connect_btn"
   top="35"
   width="90" />
+<combo_box
+follows="left|bottom"
+allow_text_entry="true"
+font="SansSerifSmall"
+height="23"
+name="server_combo"
+left_pad="15"
+width="200"
+max_chars="255"
+visible="false" />
 </layout_panel>
 <layout_panel
 follows="right|bottom"
-- 
cgit v1.2.3


From 9e89819d55a3b6ee7fc56f3efb36f273e4e05c83 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Wed, 8 Jul 2009 00:45:17 +0000
Subject: DEV-34822 - merge with 1.23 certificate notification code -r 118191

ignore-dead-branch
---
 .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d5f0bedb0..c4cbcb1dc8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2371,6 +2371,48 @@ Please choose the male or female avatar. You can change your mind later.
      notext="Female"
      yestext="Male"/>
   </notification>
+  <notification icon="alertmodal.tga"
+		name="GeneralCertificateError"
+		type="alertmodal">
+Could not connect to the server.
+[REASON]
+
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Valid From: [VALID_FROM]
+Valid To: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+   </notification>
+
+  <notification icon="alertmodal.tga"
+		name="TrustCertificateError"
+		type="alertmodal">
+The certification authority for this server is not known.
+
+Certificate Information:
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Valid From: [VALID_FROM]
+Valid To: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+
+Would you like to trust this authority?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Trust"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 7a64aad1def1b0612addbf2e66c66db061d7e182 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Thu, 9 Jul 2009 20:56:23 +0000
Subject: DEV-34822 - merge 1.23 merge -r119443 - basic slurl handling ignore
 dead branch

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c4cbcb1dc8..d177cfce7d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2371,6 +2371,15 @@ Please choose the male or female avatar. You can change your mind later.
      notext="Female"
      yestext="Male"/>
   </notification>
+  <notification icon="alertmodal.tga"
+		name="CantTeleportToGrid"
+		type="alertmodal">
+Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]).  Please close your viewer and try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification icon="alertmodal.tga"
 		name="GeneralCertificateError"
 		type="alertmodal">
-- 
cgit v1.2.3


From 73e86b0bed548b2aaba8d92837e562d6d753808a Mon Sep 17 00:00:00 2001
From: Karen Lahey <karina@lindenlab.com>
Date: Thu, 15 Oct 2009 16:52:03 -0700
Subject: MAC Address Change no longer causes viewer to die cr:Roxie

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d177cfce7d..333f5d3d2a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1356,6 +1356,18 @@ Unknown Vorbis encode failure on: [FILE]
 Unable to encode file: [FILE]
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CorruptedProtectedDataStore"
+   type="alertmodal">
+  We are unable to read your protected data so it is being reset.
+   This may happen when you change network setup.
+
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+    
   <notification
    icon="alertmodal.tga"
    name="CorruptResourceFile"
-- 
cgit v1.2.3


From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Wed, 15 Jul 2009 21:50:42 +0000
Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox
 voice code -r124876 -r125220

---
 indra/newview/skins/default/xui/en/floater_about.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.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index fac7aef690..cb5cec7bdb 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION]
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
 Qt Webkit Version: [QT_WEBKIT_VERSION]
-Vivox Version: [VIVOX_VERSION]
+Voice Server Version: [VOICE_VERSION]
 </floater.string>
   <floater.string
      name="none">
-- 
cgit v1.2.3


From 615afb52a779e0d3065c7696f5ea7d56126a7462 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Wed, 24 Feb 2010 17:15:40 -0800
Subject: remove DOS newlines

---
 .../skins/default/xui/en/floater_im_container.xml  | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index ccbba61ddf..72a01f5652 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater
- can_minimize="false"
- can_resize="true"
- height="390"
- layout="topleft"
- name="floater_im_box"
- help_topic="floater_im_box"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- title="CONVERSATIONS"
- width="392">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
-     layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="80"
-     top="0"
-     width="390" />
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="390" />
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_minimize="false"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="392">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="bottom"
+     tab_width="80"
+     top="0"
+     width="390" />
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="17"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="390" />
+</multi_floater>
-- 
cgit v1.2.3


From 1eff2a33b1fab8ebe757ce30b36dc71df5b58cb9 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 25 Feb 2010 07:12:41 -0800
Subject: Replaced Buy L arrow button which was confused with the media play
 button. Fixed image height bugs in volume and media play buttons that made
 them blurry.

---
 .../skins/default/xui/en/panel_status_bar.xml      | 32 ++++++++++++++++------
 1 file changed, 24 insertions(+), 8 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 5754f67045..a65dc8fb68 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,6 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
+ chrome="true"
  follows="top|right"
  height="19"
  layout="topleft"
@@ -10,6 +11,7 @@
  mouse_opaque="false"
  name="status"
  top="19"
+ tab_stop="false"
  width="1000">
     <panel.string
      name="StatBarDaysOfWeek">
@@ -49,12 +51,12 @@
      image_unselected="spacer35.tga"
      image_pressed="spacer35.tga"
      height="16"
-     right="-204"
+     right="-210"
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
      top="3"
-     width="100" />
+     width="110" />
     <button
      auto_resize="true"
      halign="right"
@@ -64,7 +66,7 @@
      image_unselected="BuyArrow_Over"
      image_pressed="BuyArrow_Press"
      height="16"
-     label="Buy L$"
+     label="Buy"
      label_color="EmphasisColor"
      left_pad="0"
      label_shadow="false"
@@ -73,7 +75,7 @@
      pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="2"
-     width="71" />
+     width="45" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -83,20 +85,34 @@
      height="16"
      top="5"
      layout="topleft"
-     left_pad="0"
+     left_pad="5"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="89">
+     width="80">
         24:00 AM PST
     </text>
     <button
      follows="right|top"
-     height="15"
+     height="16"
+     image_selected="Pause_Off"
+     image_unselected="Play_Off"
+     image_pressed="Play_Press"
+     image_pressed_selected="Pause_Press"
+     is_toggle="true"
+     left_pad="15"
+     top="1"
+     name="media_toggle_btn"
+     tool_tip="Click to toggle media"
+     width="16" >
+    </button>
+    <button
+     follows="right|top"
+     height="16"
      image_selected="AudioMute_Off"
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="18"
+     left_pad="5"
      top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
-- 
cgit v1.2.3


From 9757cd64e19209484333ff8d07aa86fcccaf22f6 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 10 Mar 2010 14:04:36 +0200
Subject: fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated
 opened by 'Start IM' button

added timing out of session initialization (after 30 seconds)

--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 39762d57fb..a7bca3955c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3009,4 +3009,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="unread_chat_multiple">
     [SOURCES] have said something new
   </string>"
+	<string name="session_initialization_timed_out_error">
+		The session initialization is timed out
+	</string>
 </strings>
-- 
cgit v1.2.3


From 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Wed, 10 Mar 2010 12:41:55 -0800
Subject: Clean up login page a bit

---
 indra/newview/skins/default/xui/en/panel_login.xml | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(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 4543dd3263..4885f368ae 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,8 +48,8 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="775"
-min_width="775"
+width="850"
+min_width="850"
 user_resize="false"
 height="80">
 <text
@@ -81,7 +81,7 @@ height="15"
 left_pad="8"
 name="password_text"
 top="20"
-    width="150">
+    width="135">
        Password:
 </text>
 <line_editor
@@ -106,10 +106,10 @@ label="Remember password"
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="18"
+  left_pad="10"
   name="start_location_text"
 top="20"
-  width="130">
+  width="250">
        Start at:
  </text>
 <combo_box
@@ -120,7 +120,7 @@ control_name="LoginLocation"
 max_chars="128"
 top_pad="0"
 name="start_location_combo"
-     width="135">
+     width="250">
 <combo_box.item
 label="My last location"
 name="MyLastLocation"
@@ -140,18 +140,28 @@ name="Typeregionname"   value="" />
   label="Log In"
   label_color="White"
   layout="topleft"
-  left_pad="15"
+  left_pad="10"
   name="connect_btn"
   top="35"
   width="90" />
+  <text
+  follows="left|bottom"
+  font="SansSerifSmall"
+  height="15"
+  left_pad="10"
+  name="start_location_text"
+top="20"
+  width="150">
+       Grid Name:
+ </text>
 <combo_box
 follows="left|bottom"
 allow_text_entry="true"
 font="SansSerifSmall"
 height="23"
 name="server_combo"
-left_pad="15"
-width="200"
+top_pad="0"
+width="150"
 max_chars="255"
 visible="false" />
 </layout_panel>
-- 
cgit v1.2.3


From 41ed9b3bcb07b36ff4ba58fb3c68f96c376f6e37 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 16 Mar 2010 11:00:36 -0700
Subject: New snapshot/social media floater reviewed by Richard

---
 .../skins/default/xui/en/floater_snapshot.xml      | 482 +++++----------------
 1 file changed, 107 insertions(+), 375 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index dda14f02ff..89712efbb7 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -4,392 +4,124 @@
  can_minimize="false"
  can_close="true"
  follows="left|top"
- height="516"
+ height="340"
  layout="topleft"
  name="Snapshot"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="true"
- title="SNAPSHOT PREVIEW"
- width="215">
-    <floater.string
-     name="unknown">
-        unknown
-    </floater.string>
-    <radio_group
-     height="58"
-     label="Snapshot type"
-     layout="topleft"
-     left="10"
-     name="snapshot_type_radio"
-     top="25"
-     width="205">
-        <radio_item
-         bottom="19"
-         height="16"
-         label="Email"
-         layout="topleft"
-         name="postcard" />
-        <radio_item
-         bottom="38"
-         height="16"
-         label="My inventory (L$[AMOUNT])"
-         layout="topleft"
-         name="texture" />
-        <radio_item
-         bottom="57"
-         height="16"
-         label="Save to my computer"
-         layout="topleft"
-         name="local" />
-    </radio_group>
-  <ui_ctrl 
-    height="90"
-    width="125"
+ can_dock="true"
+ title="Snapshot"
+ width="250">
+  <floater.string
+   name="unknown">
+    unknown
+  </floater.string>
+  <floater.string
+   name="share_to_web_url" translate="false">
+    http://pdp36.lindenlab.com:12777/
+  </floater.string>
+  <view
+    height="160"
+    width="225"
     layout="topleft"
     name="thumbnail_placeholder"
-    top_pad="6"
+    top_pad="30"
     follows="left|top"
     left="10"
     />
-    <text
-     type="string"
-     font="SansSerifSmall"
-     length="1"
-     follows="left|top"
-     height="14"
-     layout="topleft"
-     right="-5"
-     left_delta="0"
-     halign="right"
-     name="file_size_label"
-     top_pad="10"
-     width="195">
-        [SIZE] KB
-    </text>
-    <button
-     follows="left|top"
+  <button
+    follows="left|top"
+    height="22"
+    image_overlay="Refresh_Off"
+    layout="topleft"
+    left="20"
+    top_pad="-30"
+    name="new_snapshot_btn"
+    width="23" />
+  <line_editor
+    border_style="line"
+    border_thickness="1"
+	  follows="left|top"
+	  height="20"
+		layout="topleft"
+    left="15"
+		max_length="500"
+    name="description"
+	  top_pad="20"
+	  width="225"
+    label="Description"/>
+  <button
+   label="Share to Web" 
+   name="share" 
+   top_pad="15" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Share to Web" 
+   name="share_to_web" 
+   top_delta="0" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Save to My Inventory" 
+   name="save_to_inventory" 
+   top_delta="0" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Save Snapshot" 
+   name="save" 
+   top_pad="7" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Email Snapshot" 
+   name="share_to_email" 
+   top_delta="0" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Save to My Computer" 
+   name="save_to_computer" 
+   top_delta="0" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Set As Profile Pic" 
+   name="set_profile_pic" 
+   top_pad="7" 
+   left="15" 
+   width="130"/>
+  <button
+   label="Back" 
+   name="cancel" 
+   top_delta="0" 
+   left="15" 
+   width="130"/>
+  <button
+    follows="right"
+    height="22"
+    layout="topleft"
+    right="-12"
+    name="show_advanced"
+    image_overlay="TabIcon_Close_Off"
+    top_delta="1"
+    width="30"/>
+  <button
+     follows="right"
      height="22"
-     image_overlay="Refresh_Off"
-     layout="topleft"
-     left="10"
-     name="new_snapshot_btn"
-     width="23" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Send"
-     layout="topleft"
-     left_pad="5"
-     right="-5"
-     name="send_btn"
-     width="100" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Save (L$[AMOUNT])"
-     layout="topleft"
-     right="-5"
-     name="upload_btn"
-     top_delta="0"
-     width="100" />
-    <flyout_button
-     follows="left|top"
-     height="23"
-     label="Save"
-     layout="topleft"
-     right="-5"
-     name="save_btn"
-     tool_tip="Save image to a file"
-     top_delta="0"
-     width="100">
-        <flyout_button.item
-         label="Save"
-         name="save_item"
-         value="save" />
-        <flyout_button.item
-         label="Save As..."
-         name="saveas_item"
-         value="save as" />
-    </flyout_button>
-        <button
-     follows="left|top"
-     height="23"
-     label="More"
-     layout="topleft"
-     left="10"
-     name="more_btn"
-     tool_tip="Advanced options"
-     width="80" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Less"
-     layout="topleft"
-     left_delta="0"
-     name="less_btn"
-     tool_tip="Advanced options"
-     top_delta="0"
-     width="80" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     right="-5"
-     left_pad="5"
-     name="discard_btn"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="type_label2"
-     top_pad="5"
-     width="127">
-        Size
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left_pad="5"
-     name="format_label"
-     top_delta="0"
-     width="70">
-        Format
-    </text>
-    <combo_box
-     height="23"
-     label="Resolution"
-     layout="topleft"
-     left="10"
-     name="postcard_size_combo"
-     width="120">
-        <combo_box.item
-         label="Current Window"
-         name="CurrentWindow"
-         value="[i0,i0]" />
-        <combo_box.item
-         label="640x480"
-         name="640x480"
-         value="[i640,i480]" />
-        <combo_box.item
-         label="800x600"
-         name="800x600"
-         value="[i800,i600]" />
-        <combo_box.item
-         label="1024x768"
-         name="1024x768"
-         value="[i1024,i768]" />
-        <combo_box.item
-         label="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
-    </combo_box>
-    <combo_box
-     height="23"
-     label="Resolution"
      layout="topleft"
-     left_delta="0"
-     name="texture_size_combo"
+     right="-12"
+     visible="false" 
+     name="hide_advanced"
+     image_overlay="TabIcon_Open_Off"
      top_delta="0"
-     width="127">
-        <combo_box.item
-         label="Current Window"
-         name="CurrentWindow"
-         value="[i0,i0]" />
-        <combo_box.item
-         label="Small (128x128)"
-         name="Small(128x128)"
-         value="[i128,i128]" />
-        <combo_box.item
-         label="Medium (256x256)"
-         name="Medium(256x256)"
-         value="[i256,i256]" />
-        <combo_box.item
-         label="Large (512x512)"
-         name="Large(512x512)"
-         value="[i512,i512]" />
-        <combo_box.item
-         label="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
-    </combo_box>
-    <combo_box
-     height="23"
-     label="Resolution"
-     layout="topleft"
-     left_delta="0"
-     name="local_size_combo"
-     top_delta="0"
-     width="127">
-        <combo_box.item
-         label="Current Window"
-         name="CurrentWindow"
-         value="[i0,i0]" />
-        <combo_box.item
-         label="320x240"
-         name="320x240"
-         value="[i320,i240]" />
-        <combo_box.item
-         label="640x480"
-         name="640x480"
-         value="[i640,i480]" />
-        <combo_box.item
-         label="800x600"
-         name="800x600"
-         value="[i800,i600]" />
-        <combo_box.item
-         label="1024x768"
-         name="1024x768"
-         value="[i1024,i768]" />
-        <combo_box.item
-         label="1280x1024"
-         name="1280x1024"
-         value="[i1280,i1024]" />
-        <combo_box.item
-         label="1600x1200"
-         name="1600x1200"
-         value="[i1600,i1200]" />
-        <combo_box.item
-         label="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
-    </combo_box>
-    <combo_box
-     height="23"
-     label="Format"
-     layout="topleft"
-     left_pad="5"
-     name="local_format_combo"
-     width="70">
-        <combo_box.item
-         label="PNG"
-         name="PNG" />
-        <combo_box.item
-         label="JPEG"
-         name="JPEG" />
-        <combo_box.item
-         label="BMP"
-         name="BMP" />
-    </combo_box>
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label="Width"
-     label_width="40"
-     layout="topleft"
-     left="10"
-     max_val="6016"
-     min_val="32"
-     name="snapshot_width"
-     top_pad="10"
-     width="95" />
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label="Height"
-     label_width="40"
-     layout="topleft"
-     left_pad="5"
-     max_val="6016"
-     min_val="32"
-     name="snapshot_height"
-     top_delta="0"
-     width="95" />
-    <check_box
-     bottom_delta="20"
-     label="Constrain proportions"
-     layout="topleft"
-     left="10"
-     name="keep_aspect_check" />
-    <slider
-     decimal_digits="0"
-     follows="left|top"
-     height="15"
-     increment="1"
-     initial_value="75"
-     label="Image quality"
-     label_width="100"
-     layout="topleft"
-     left_delta="0"
-     max_val="100"
-     name="image_quality_slider"
-     top_pad="5"
-     width="205" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="13"
-     layout="topleft"
-     left="10"
-     name="layer_type_label"
-     top_pad="5"
-     width="50">
-        Capture:
-    </text>
-    <combo_box
-     height="23"
-     label="Image Layers"
-     layout="topleft"
-     left="30"
-     name="layer_types"
-     width="145">
-        <combo_box.item
-         label="Colors"
-         name="Colors"
-         value="colors" />
-        <combo_box.item
-         label="Depth"
-         name="Depth"
-         value="depth" />
-    </combo_box>
-    <check_box
-     label="Interface"
-     layout="topleft"
-     left="30"
-     top_pad="10"
-     width="180"
-     name="ui_check" />
-    <check_box
-     label="HUDs"
-     layout="topleft"
-     left="30"
-     top_pad="10"
-     width="180"
-     name="hud_check" />
-    <check_box
-     label="Keep open after saving"
-     layout="topleft"
-     left="10"
-     top_pad="8"
-     width="180"
-     name="keep_open_check" />
-    <check_box
-     label="Freeze frame (fullscreen)"
-     layout="topleft"
-     left="10"
-     top_pad="8"
-     width="180"
-     name="freeze_frame_check" />
-    <check_box
-     label="Auto-refresh"
-     layout="topleft"
-     left="10"
-     top_pad="8"
-     width="180"
-     name="auto_snapshot_check" />
+     width="30"/>
+  <panel 
+    visible="false" 
+    left="250" 
+    top="35" 
+    name="snapshot_advanced" 
+    filename="panel_snapshot_advanced.xml"/>
 </floater>
-- 
cgit v1.2.3


From 11e6e208d43f1347037fb312921a65af138f47b4 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 17 Mar 2010 14:21:58 -0700
Subject: Adding error handling to share to web feature. Reviewed by Callum

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5680b91c05..c39a91281e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5292,6 +5292,13 @@ Failed to find [TYPE] in database.
 Failed to find [TYPE] named [DESC] in database.
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="ShareToWebFailed"
+   type="notify">
+    Failed to upload image to web.
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="InvalidWearable"
-- 
cgit v1.2.3


From d5d9668a59895874951fb3e5927ea0159270a6e8 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 25 Mar 2010 09:04:01 +0200
Subject: Fixed low bug EXT-6488 (Teleport menuitem is enabled for offline
 residents in the context menu and inspectors)

- Added a check for a teleport offer ability. In XML created a paremeter and check it in source code.

Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/86/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml | 2 ++
 indra/newview/skins/default/xui/en/menu_people_nearby.xml       | 3 +++
 2 files changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 1b002b1c32..a5ac5f76e1 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -40,6 +40,8 @@
    name="teleport">
     <menu_item_call.on_click
      function="InspectAvatar.Teleport"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.EnableTeleportOffer"/>
   </menu_item_call>
   <menu_item_call
    label="Invite to Group"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 014a52bb4f..d2e35e4cc0 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -88,5 +88,8 @@
     name="teleport">
       <menu_item_call.on_click
        function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
     </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From eb119c2268798b4c64fb437806199ee7ae509217 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 23 Mar 2010 14:09:38 +0200
Subject: Fixed low bug EXT-4081 (Lag Meter: Ctrl+W does not close floater)

- Set 'Close' text of tooltip instead of 'Close (Ctrl+W)' for close button of chrome floaters

Reviewed by Mike Antipov

--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 c0573c0215..1df3e21de3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -98,6 +98,7 @@
 	<!-- ButtonToolTips, llfloater.cpp -->
 	<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
 	<string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string>
+	<string name="BUTTON_CLOSE_CHROME">Close</string>>
 	<string name="BUTTON_RESTORE">Restore</string>
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
-- 
cgit v1.2.3


From 54a3f1051e5ef411b39ac34ba37fc7444832a3eb Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 25 Mar 2010 17:53:25 +0200
Subject: =?UTF-8?q?fixed=20EXT-6489=20=E2=80=9C"User=20not=20online=20-=20?=
 =?UTF-8?q?inventory=20has=20been=20saved"=20should=20be=20logged=20to=20I?=
 =?UTF-8?q?M=20log=E2=80=9D,=20reviewed=20by=20Mike=20Antipov=20at=20https?=
 =?UTF-8?q?://codereview.productengine.com/secondlife/r/90/?=
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/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c39a91281e..5403defc59 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4269,6 +4269,13 @@ The string [STRING_NAME] is missing from strings.xml
    type="notifytip">
 [MESSAGE]
   </notification>
+  
+  <notification
+   icon="notifytip.tga"
+   name="IMSystemMessageTip"
+   type="notifytip">
+[MESSAGE]
+  </notification>
 
   <notification
    icon="notifytip.tga"
-- 
cgit v1.2.3


From 3318c8f09e5edb907712d626ea12c2cbd6136c50 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 25 Mar 2010 18:06:48 +0200
Subject: =?UTF-8?q?fixed=20EXT-3818=20=E2=80=9C[BSI]=20plain=20text=20chat?=
 =?UTF-8?q?=20has=20too=20much=20space=20between=20lines=E2=80=9D,=20To=20?=
 =?UTF-8?q?fix=20EXT-6373=20I=20added=20vertical=20padding=20between=20pos?=
 =?UTF-8?q?ts=20in=20plain-text=20and=20unified=20padding=20in=20default?=
 =?UTF-8?q?=20mode=20of=20IM/chat=20history.=20Now=20I'm=20backing=20out?=
 =?UTF-8?q?=20the=20changes=20to=20plain-text=20mode=20that=20led=20to=20E?=
 =?UTF-8?q?XT-3818.=20reviewed=20by=20Leyla=20Farazha=20at=20https://coder?=
 =?UTF-8?q?eview.productengine.com/secondlife/r/95/?=
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 deletion(-)

(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 aa3ea736b8..ef885e8045 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -2,7 +2,6 @@
 <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 869fc803cb30c311fa5bd20aa036e1db683ce874 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 25 Mar 2010 18:12:00 +0200
Subject: Fixed normal bug (EXT-6484) Drop down dialogs have same/similar color
 to background & no border. - Removed unused attributes from drop down menus
 in side panel People. - Removed drop_shadow="false" to display shadow and
 distinguish drop down from background.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_group_plus.xml               | 2 +-
 indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index e83d07baec..fce7414d80 100644
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+     mouse_opaque="false">
   <menu_item_call name="item_join" label="Join Group...">
     <menu_item_call.on_click function="People.Group.Plus.Action" userdata="join_group" />
   </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index f1117d1419..92752a0fee 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+     mouse_opaque="false">
   <menu_item_check
    label="Sort by Name"
    name="sort_name">
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index df3cb26b04..2efb204ffb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+     mouse_opaque="false">
   <menu_item_check
    label="Display Group Icons"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 39f9e48609..69b3831738 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+     mouse_opaque="false">
   <menu_item_check
      label="Sort by Recent Speakers"
      name="sort_by_recent_speakers">
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index cfd6dc78b6..5c9555db92 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+     mouse_opaque="false">
   <menu_item_check
    label="Sort by Most Recent"
    name="sort_most">
-- 
cgit v1.2.3


From 378b65ca4cad6d6bcd1d5b0d58cb7c0bb7834a22 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 25 Mar 2010 18:31:08 +0200
Subject: Fixed normal bug EXT-5604 - Context menu of URL is covered by profile
 description itself This issue was fixed when menu became non top-control.
 Enabled context menu in expandable textbox in profile panel.

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

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

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 4112b65635..4386475cf1 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -117,6 +117,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.show_context_menu="true"
                name="sl_description_edit"
                top_pad="-3"
                translate="false"
@@ -171,6 +172,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.show_context_menu="true"
                name="fl_description_edit"
                top_pad="-3"
                translate="false"
@@ -311,6 +313,7 @@
             name="sl_groups"
           top_pad="0"
             translate="false"
+            textbox.show_context_menu="true"
             width="298"
             expanded_bg_visible="true"
             expanded_bg_color="DkGray">
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 30191aecb6..34ec64b8af 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -107,6 +107,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.show_context_menu="true"
                name="sl_description_edit"
                top_pad="-3"
                translate="false"
@@ -151,6 +152,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.show_context_menu="true"
                name="fl_description_edit"
                top_pad="-3"
                translate="false"
@@ -289,6 +291,7 @@
             left="7"
             name="sl_groups"
             textbox.max_length="512"
+            textbox.show_context_menu="true"
             top_pad="0"
             translate="false"
             width="290"
-- 
cgit v1.2.3


From ce53bc50c91246fb27f300c0f4ae745d2bc199b5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 25 Mar 2010 11:36:11 -0700
Subject: EXT-5922 -  Nearby Media Popover: make padding consistent

---
 .../skins/default/xui/en/panel_nearby_media.xml    | 56 +++++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index d14712a7fa..11aaec933a 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,34 +2,34 @@
 <panel
 	can_resize="true"
 	can_close="false"
-	mouse_opaque="true"
-	bg_opaque_image="Volume_Background" 
-	bg_alpha_image="Volume_Background" 
-	background_opaque="true"
+ bg_opaque_image="Volume_Background" 
+ bg_alpha_image="Volume_Background" 
+  background_opaque="true"
 	background_visible="true"
 	layout="topleft"
 	width="270"
-	height="235"
+	height="230"
 	name="nearby_media"
 	help_topic="nearby_media">
+  <string name="media_item_count_format">(%ld media items)</string>
   <string name="empty_item_text">&lt;empty&gt;</string>
   <string name="parcel_media_name">Parcel Streaming Media</string>
   <string name="parcel_audio_name">Parcel Streaming Audio</string>
   <string name="playing_suffix">(playing)</string>
   <panel
 	  bevel_style="in"
-	  background_visible="false" 
+    background_visible="false" 
 	  follows="left|right|top"
 	  top="0"
-	  height="30"
+	  height="35"
 	  name="minimized_controls" 
 	  left="0">
 	<button
 		name="all_nearby_media_disable_btn"
 		follows="left"
 		tool_tip="Turn all nearby media off"
-		left="15"
-		width="60"
+		left="8"
+		width="66"
 		height="22"
 		label="Stop All">
 	  <button.commit_callback
@@ -40,7 +40,7 @@
 		follows="left"
 		tool_tip="Turn all nearby media on"
 		left_pad="4"
-		width="60"
+		width="66"
 		height="22"
 		label="Start All">
 	  <button.commit_callback
@@ -68,8 +68,8 @@
 		follows="right"
 		tool_tip="Advanced Controls"
 		top_delta="0"
-		right="-10"
-		width="60"
+		right="-8"
+		width="66"
 		height="22"
 		toggle="true"
 		label="More &gt;&gt;"
@@ -95,10 +95,23 @@
 		follows="top|left"
 		font="SansSerif"
 		left="10"
-		name="nearby_media"
 		width="100">
 	  Nearby Media
 	</text>
+	<!-- nix for now
+		 <text
+		 bottom_delta="1"
+		 type="string"
+		 follows="top|left|right"
+		 font="SansSerif"
+		 font.style="ITALIC"
+		 font.size="Small"
+		 name="media_item_count"
+		 left="115"
+		 right="-10">
+		 (?? media items)
+		 </text>
+	-->
 	<text
 		type="string"
 		length="1"
@@ -106,7 +119,6 @@
 		font="SansSerif"
 		top_pad="15"
 		left="10"
-		name="show"
 		width="40">
 	  Show:
 	</text>
@@ -135,7 +147,6 @@
 		  name="OnOthers" />
 	</combo_box>
 	<scroll_list
-		name="media_list"
 		follows="left|top|bottom|right"
 		column_padding="0"
 		height="105"
@@ -144,7 +155,8 @@
 		bg_stripe_color="0.25 0.25 0.25 0.25"
 		top_pad="8"
 		left="10"
-		right="-10">
+		right="-10"
+		name="media_list">
 	  <scroll_list.columns
 		  type="checkbox"
 		  width="-1"
@@ -181,7 +193,6 @@
 		top_pad="5"
 		height="30"
 		left="10"
-		name="media_controls_panel"
 		right="-10">
 	  <layout_stack
 		  name="media_controls"
@@ -190,12 +201,14 @@
 		  height="26"
 		  layout="topleft"
 		  top="4"
-		  left="10"
+		  left="8"
 		  right="-10"
 		  border_size="0"
+		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
 			name="stop"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -223,6 +236,7 @@
 		</layout_panel>
 		<layout_panel
 			name="play"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -250,6 +264,7 @@
 		</layout_panel>
 		<layout_panel
 			name="pause"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -276,6 +291,7 @@
 		</layout_panel>
 		<layout_panel
 			name="volume_slider_ctrl"
+			mouse_opaque="false"
 			auto_resize="true"
 			user_resize="false"
 			follows="left|right"
@@ -300,6 +316,7 @@
 		</layout_panel>
 		<layout_panel
 			name="mute"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -328,6 +345,7 @@
 		</layout_panel>
 		<layout_panel
 			name="zoom"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -355,6 +373,7 @@
 		</layout_panel>
 		<layout_panel
 			name="unzoom"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -383,6 +402,7 @@
 		<layout_panel
 			name="right_bookend"
 			width="0"
+			mouse_opaque="false"
 			user_resize="false" />
 	  </layout_stack>
 	</panel>
-- 
cgit v1.2.3


From 91d560fc901b6b0df9de4a9279414ace0115b708 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 25 Mar 2010 11:41:33 -0700
Subject: EXT-5922 -  Nearby Media Popover: make padding consistent (removed
 unused xml)

---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml | 14 --------------
 1 file changed, 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 11aaec933a..53dda1927a 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -98,20 +98,6 @@
 		width="100">
 	  Nearby Media
 	</text>
-	<!-- nix for now
-		 <text
-		 bottom_delta="1"
-		 type="string"
-		 follows="top|left|right"
-		 font="SansSerif"
-		 font.style="ITALIC"
-		 font.size="Small"
-		 name="media_item_count"
-		 left="115"
-		 right="-10">
-		 (?? media items)
-		 </text>
-	-->
 	<text
 		type="string"
 		length="1"
-- 
cgit v1.2.3


From 5fbcc249e3af8e8cd1edabf7a4b6e4c9ca0fc7e3 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 25 Mar 2010 22:52:28 +0200
Subject: Fixed normal bug EXT-6325 (ABOUT SECOND LIFE window, Copy to
 Clipboard button overlaps horizontal rule).

- Decreased height of text editor.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_about.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.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index bc67621dfd..d03231a3fa 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -76,7 +76,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
         allow_html="true" 
        follows="top|left"
        font="SansSerif"
-       height="350"
+       height="343"
        bg_readonly_color="Transparent"
        left="5"
        max_length="65536"
-- 
cgit v1.2.3


From 836f99aebce159af66a6d723555f88c94e7e15ed Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 25 Mar 2010 16:05:20 -0700
Subject: snapshot ui updates

---
 .../skins/default/xui/en/floater_snapshot.xml      | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 89712efbb7..7dcf2aab99 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_minimize="false"
- can_close="true"
+ can_minimize="true"
+ can_close="false"
  follows="left|top"
  height="340"
  layout="topleft"
@@ -23,7 +23,7 @@
   </floater.string>
   <view
     height="160"
-    width="225"
+    width="230"
     layout="topleft"
     name="thumbnail_placeholder"
     top_pad="30"
@@ -45,74 +45,74 @@
 	  follows="left|top"
 	  height="20"
 		layout="topleft"
-    left="15"
+    left="10"
 		max_length="500"
     name="description"
-	  top_pad="20"
-	  width="225"
+	  top_pad="15"
+	  width="230"
     label="Description"/>
   <button
-   label="Share to Web" 
+   label="Share Snapshot" 
    name="share" 
-   top_pad="15" 
-   left="15" 
+   top_pad="20" 
+   left="10" 
    width="130"/>
   <button
    label="Share to Web" 
    name="share_to_web" 
    top_delta="0" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Save to My Inventory" 
    name="save_to_inventory" 
    top_delta="0" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Save Snapshot" 
    name="save" 
    top_pad="7" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Email Snapshot" 
    name="share_to_email" 
    top_delta="0" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Save to My Computer" 
    name="save_to_computer" 
    top_delta="0" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Set As Profile Pic" 
    name="set_profile_pic" 
    top_pad="7" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
    label="Back" 
    name="cancel" 
    top_delta="0" 
-   left="15" 
+   left="10" 
    width="130"/>
   <button
-    follows="right"
-    height="22"
-    layout="topleft"
-    right="-12"
+     follows="left"
+     height="22"
+     layout="topleft"
+     left="210"
     name="show_advanced"
     image_overlay="TabIcon_Close_Off"
     top_delta="1"
     width="30"/>
   <button
-     follows="right"
+     follows="left"
      height="22"
      layout="topleft"
-     right="-12"
+     left="210"
      visible="false" 
      name="hide_advanced"
      image_overlay="TabIcon_Open_Off"
@@ -121,7 +121,7 @@
   <panel 
     visible="false" 
     left="250" 
-    top="35" 
+    top="17"    
     name="snapshot_advanced" 
     filename="panel_snapshot_advanced.xml"/>
 </floater>
-- 
cgit v1.2.3


From 4d8338ff3eb91b7185b347b4c538ae20ff7940ce Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 26 Mar 2010 09:47:42 +0200
Subject: Fixen normal EXT-6434 (Mini Map does not go transparent when not in
 focus)

- Set background opaque of the floater depending on focus and made map's background color transparent

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_map.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_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 5d35275e17..e21e44204d 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ bg_alpha_image_overlay="DkGray_66"
  legacy_header_height="18"
  can_minimize="true" 
  can_resize="true"
-- 
cgit v1.2.3


From 4b847b4388a38209ec8e12ed55d8137c94119c17 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 26 Mar 2010 10:28:57 +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,=20replac?=
 =?UTF-8?q?ed=20[NAME]=20with=20[NAME=5FSLURL]=20in=20teleport=20offer=20n?=
 =?UTF-8?q?otification,=20this=20will=20unify=20offers=20appearance=20and?=
 =?UTF-8?q?=20gap=20between=20offers=20in=20IM=20chat=20log=20with=20disab?=
 =?UTF-8?q?led=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/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5403defc59..6d18111be0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5110,7 +5110,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    icon="notify.tga"
    name="TeleportOffered"
    type="offer">
-[NAME] has offered to teleport you to their location:
+[NAME_SLURL] has offered to teleport you to their location:
 
 [MESSAGE]
     <form name="form">
-- 
cgit v1.2.3


From 56fa20e168240fe6c971a8c8e672fc5a9e2b6690 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 26 Mar 2010 14:38:03 +0200
Subject: Fixed major bug EXT-6544 - remove Admin > God Tools > Grid > Kick All
 Residents button. Removed "Kick all" button and corresponding code.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/117/

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 36ef6beb59..240871ec25 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -28,19 +28,6 @@
          name="grid"
          top="16"
          width="398">
-            <button
-             follows="left|top"
-             height="20"
-             label="Kick all Residents"
-             label_selected="Kick all Residents"
-             layout="topleft"
-             left="10"
-             name="Kick all users"
-             top="30"
-             width="120">
-				<button.commit_callback
-				function="GridTools.KickAll" />
-			</button>
             <button
              follows="left|top"
              height="20"
-- 
cgit v1.2.3


From 379517ce5e1535b20a94ef3a581e1b25223f8798 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 26 Mar 2010 14:39:46 +0200
Subject: Fixed normal bug EXT-6070 - Truncated strings in window to buy linden
 dollars Increased textbox width. French translation is the longest so other
 languages will be ok.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/114/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_buy_currency.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 e02d32596a..637f9f55d4 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -24,13 +24,13 @@
    <text
      type="string"
      length="1"
-     follows="top|left"
+     follows="top|left|right"
      font="SansSerifHuge"
      layout="topleft"
      left="20"
      height="30"
      top="25"
-     width="300"
+     width="340"
      name="info_need_more">
         You need more L$
     </text>
@@ -55,7 +55,7 @@
      left="20"
      height="30"
      top="25"
-     width="200"
+     width="300"
      name="info_buying">
         Buy L$
     </text>
@@ -178,8 +178,8 @@
      follows="top|left"
      height="16"
      halign="right"
-     left="140"
-     width="180"
+     left="20"
+     width="300"
      layout="topleft"
      name="buy_action">
         [ACTION]
-- 
cgit v1.2.3


From e962b8418f8a37c1d18743c31199dd9c33d5c74b Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 26 Mar 2010 16:29:47 +0200
Subject: fix for EXT-6475 Scrollbar in the Notices panel is semitransparent
 and overlaps controls (also for EXT-6374  Side Panel> Create a Notice> dialog
 boxes overrun up/down slider)
 https://codereview.productengine.com/secondlife/r/100/ reviewed Leyla Farazha
 ,vsavchuk

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 731b3c119c..479629f6ea 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -131,6 +131,7 @@ Maximum 200 per group daily
             Subject:
         </text>
         <line_editor
+         follows="left|top|right"
          border_style="line"
          border_thickness="1"
          height="16"
@@ -153,6 +154,7 @@ Maximum 200 per group daily
             Message:
         </text>
         <text_editor
+         follows="left|top|right"
          height="90"
          layout="topleft"
          left_pad="3"
@@ -173,6 +175,7 @@ Maximum 200 per group daily
             Attach:
         </text>
         <line_editor
+         follows="left|top|right"
          enabled="false"
          height="19"
          layout="topleft"
@@ -222,7 +225,7 @@ Maximum 200 per group daily
          label="Send"
          label_selected="Send"
          layout="topleft"
-         right="-10"
+         right="-25"
          top_pad="10"
          name="send_notice"
          width="100" />
-- 
cgit v1.2.3


From f55af5fcdfdd0b4520e382d315afefd41c534820 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 29 Mar 2010 14:07:40 +0300
Subject: done EXT-6547 Rename stuff related with Panel Look Info to Panel
 Outfit Edit

renamed panel_look_info.xml to panel_outfit_edit.xml
renamed llpanellookinfo.cpp/llpanellookinfo.h to llpaneloutfitedit.cpp/llpaneloutfitedit.h
renamed LLPanelLookInfo to LLPanelOutfitEdit

Reviewed at https://codereview.productengine.com/secondlife/r/130/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 233 +++++++++++++++++++++
 .../skins/default/xui/en/sidepanel_appearance.xml  |   6 +-
 2 files changed, 236 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfit_edit.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
new file mode 100644
index 0000000000..d4924562fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  background_visible="true"
+  border="false"
+	height="570"
+	follows="all"
+	label="Look Info"
+	layout="topleft"
+	name="look_info"
+	width="320">
+	<panel.string
+		name="not_available">
+		(N\A)
+	</panel.string>
+	<panel.string
+		name="unknown">
+		(unknown)
+	</panel.string>
+	<panel
+		background_visible="true"
+		bevel_style="none"
+		follows="left|top|right|bottom"
+		height="530"
+		label="Outfit"
+		layout="topleft"
+		name="look_management_panel"
+		width="320">
+        <panel
+          follows="left|right|top"
+            header_visible="false"
+            layout="topleft"
+            min_height="300"
+            name="look_group"
+            title="Outfit Group"
+          top="0">
+            <panel
+                follows="left|right|top"
+                height="210"
+                layout="topleft"
+                top_pad="0"
+                name="look_info_group_bar"
+                width="295">
+                <text
+                    type="string"
+                    length="1"
+                    follows="left|top"
+                    height="20"
+                    layout="topleft"
+                    mouse_opaque="false"
+                    name="curr_look_name"
+                    width="175">
+                    Look: [LOOK]
+                </text>
+                <button
+                    follows="left|top"
+                    height="20"
+                    label="Wear"
+                    layout="topleft"
+                    name="wear_look_btn"
+                    left_pad="5"
+                    top_pad="-24"
+                    width="65" />
+                <button
+                    follows="left|top"
+                    height="20"
+                    layout="topleft"
+                    left_pad="5"
+                    name="back_btn"
+                    width="20" />
+            </panel>
+        </panel>
+
+        <panel
+            follows="left|right|top"
+          height="200"
+          layout="topleft"
+          name="outfit_display"
+          top_pad="10"
+          width="320">
+          
+              <scroll_list
+                  width="285"
+                  column_padding="0"
+                  draw_heading="false"
+                  draw_stripes="false"
+                  follows="left|top|bottom|right"
+                  layout="topleft"
+                  name="look_items_list"
+                  search_column="1"
+                  sort_column="2"
+                  left="0"
+                  height="200"
+                  top_pad="0">
+                  <scroll_list.columns
+                      label="Look Item"
+                      name="look_item"
+                      width="285" />
+                  <scroll_list.columns
+                      label="Outfit Item Sort"
+                      width="0"
+                      sort_column="look_item_sort"
+                      name="look_item_sort" />
+              </scroll_list>
+              <button
+                  follows="left|top|right"
+                  height="20"
+                  label="-"
+                  left_pad="0"
+                  layout="topleft"
+                  name="edit_wearable_btn"
+                  width="20" />
+        </panel>
+        <panel
+          follows="all"
+            header_visible="false"
+            min_height="100"
+          left="0"
+            name="inventory_group"
+            title="My Inventory"
+          top_pad="10"
+          width="230">
+            <panel
+                follows="left|right|top"
+                height="270"
+                name="lower_look_accordion"
+                width="295">
+                <panel
+                    follows="left|right|top"
+                    height="20"
+                    layout="topleft"
+                    name="inventory_bar"
+                    width="295">
+                    <text
+                        type="string"
+                        length="1"
+                        follows="left|top"
+                        height="20"
+                        layout="topleft"
+                        mouse_opaque="false"
+                        name="inventory_info_text"
+                        width="100">
+                        My Inventory
+                    </text>
+                    <combo_box
+                        follows="left"
+                        height="20"
+                        layout="topleft"
+                        left_pad="0"
+                        top_pad="-24"
+                        name="inventory_filter"
+                        tool_tip="Only show the selected inventory types"
+                        width="185" />
+                </panel>
+                <panel
+                    follows="left|right|top"
+                    height="20"
+                    layout="topleft"
+                    name="look_item_filter_bar"
+                    width="295">
+                    <filter_editor
+                        background_image="TextField_Search_Off"
+                        follows="left|top|right"
+                        font="SansSerif"
+                        label="Outfit Item Filter"
+                        layout="topleft"
+                        left="0"
+                        top_pad="0"
+                        width="270"
+                        height="20"
+                        name="look_item_filter"
+                        text_color="black"
+                        text_pad_left="25" />
+                </panel>
+                <panel
+                    follows="all"
+                    height="230"
+                    layout="topleft"
+                    name="inventory_panel"
+                    width="285">
+                    <inventory_panel
+                        allow_multi_select="true"
+                        border="true"
+                        follows="left|top|right|bottom"
+                        height="230"
+                        mouse_opaque="false"
+                        name="inventory_items"
+                        width="285"/>
+                </panel>
+            </panel>
+        </panel>
+	</panel>
+	<panel
+		follows="left|right|bottom"
+		height="30"
+		layout="topleft"
+		left="5"
+		top_pad="0"
+		name="button_bar"
+		width="295">
+		<button
+			follows="top|left|right"
+			height="25"
+			label="Add"
+			left="0"
+			layout="topleft"
+			name="add_item_btn"
+			width="90" />
+		<button
+			follows="left|right"
+			height="25"
+			left_pad="0"
+			label="Remove"
+			layout="topleft"
+			name="remove_item_btn"
+			width="90" />
+		<button
+			follows="top|left|right"
+			height="25"
+			label="UP"
+			left_pad="0"
+			layout="topleft"
+			name="up_btn"
+			width="55" />
+		<button
+			follows="left|top|right"
+			height="25"
+			label="DOWN"
+			left_pad="0"
+			layout="topleft"
+			name="down_btn"
+			width="60" />
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index b3d55fec65..735635f1a0 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -102,12 +102,12 @@ width="333">
 		name="newlook_btn"
 		 width="100" />-->
    <panel
-   class="panel_look_info"
-   filename="panel_look_info.xml"
+   class="panel_outfit_edit"
+   filename="panel_outfit_edit.xml"
    follows="all"
    layout="topleft"
    left="0"
-   name="panel_look_info"
+   name="panel_outfit_edit"
    top="35"
    visible="false" />
    <panel
-- 
cgit v1.2.3


From cb98c887da13cf5dc9ebae16028d7217e893c61e Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 29 Mar 2010 18:14:39 +0300
Subject: Fixed normal bug EXT-6048 (Shortcut for Groups Ctrl-Shift-G)

-Added tag for shortcut to the XML

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

--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 a08bc16066..ac31636ed2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -159,7 +159,8 @@
         <menu_item_call
          label="My Groups"
          layout="topleft"
-         name="My Groups">
+         name="My Groups"
+         shortcut="control|shift|G">
             <menu_item_call.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
-- 
cgit v1.2.3


From 50802e68fc272e4dd78220210781ac036806d107 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 30 Mar 2010 12:14:37 +0300
Subject: Fixed normal bug EXT-5696 (chiclets bar minimal width doesn't match
 design specification) * Increased the minimal width of Chiclet panel up to 95
 px. * Also set default width between chiclet panel & im well the same as
 minimal (4 px).

For now minimal viewer width when all buttons are still visible (and have non-truncated labels in the 'EN' locale)
 with opened sidetray is 1042 px; with short Speak button (without text label) is 991 px.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/126/
See also EXT-3397

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.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_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 58c5c11e51..b6d7bf8dd0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -263,7 +263,7 @@
          top="0"
          name="chiclet_list_panel"
          width="189"
-         min_width="60"
+         min_width="95"
          user_resize="false"
          auto_resize="true">
 <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
@@ -274,7 +274,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              height="24"
              layout="topleft"
              left="1"
-             min_width="60"
+             min_width="95"
              name="chiclet_list"
              top="7"
              chiclet_padding="4"
@@ -330,7 +330,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="4"
          name="DUMMY"
          top="0"
-         width="5"/>
+         width="4"/>
         <layout_panel
          auto_resize="false"
          follows="right"
-- 
cgit v1.2.3


From 337ddc1593a1d8200952bb12b1ed77e94a98a1d8 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 30 Mar 2010 12:49:05 +0300
Subject: fixed EXT-6509 URL-name of object is shown as hyperlink in widget
 style Nearby chat

set allow_html to false for Message Header and Name field of Object Inspector

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/inspect_object.xml    | 1 +
 indra/newview/skins/default/xui/en/panel_chat_header.xml | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 00e00b9694..b8a7222e8e 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -26,6 +26,7 @@ owner [OWNER]
   <string name="Touch">Touch</string>
   <string name="Sit">Sit</string>
   <text
+     allow_html="false"
      follows="all"
      font="SansSerifLarge"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 250dadd390..9124ad528d 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -21,6 +21,7 @@
          top="3"
          width="18" />
     <text
+      allow_html="false"
       allow_scroll="false"
       v_pad = "7"
       read_only = "true"
-- 
cgit v1.2.3


From c73dcb079991bad12458386274cec409013ad76b Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 30 Mar 2010 15:51:32 +0300
Subject: Fixed bug EXT-6270 (No confirm teleport dialog appears, while
 teleporting from teleport history tab).

Added teleport confirmation dialog to the teleport history panel.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/135/

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d18111be0..8501143fe6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3110,6 +3110,18 @@ Teleport to [PICK]?
      yestext="Teleport"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportToHistoryEntry"
+   type="alertmodal">
+Teleport to [HISTORY_ENTRY]?
+    <usetemplate
+     ignoretext="Confirm that I want to teleport to a history location"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Teleport"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    label="Message everyone in your Estate"
-- 
cgit v1.2.3


From 67a7112a7cfae8633cfd903e24cec8b003a3cee9 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 30 Mar 2010 17:42:05 +0300
Subject: Completed normal task EXT-3397 (Hide well buttons if there are no
 active IM sessions and unresolved notifications) * Implemented hiding of
 bottom tray's wells if there are no active IMs or unresolved notifications
 (via LLBottomTray::notifyParent)

* Also refactored initializing code to init a pointer to a chiclet panel and map with bottomtray parts in postBuild BEFORE initializing start wells' visibility.

For now minimal viewer width when all buttons are still visible (and have non-truncated labels in the 'EN' locale) with opened sidetray is 1041 px; with short Speak button (without text label) is 990 px. (with implemented patch in https://codereview.productengine.com/secondlife/r/126/)

Each well button takes 37 px (with a padding). So, they can free up to 74 px when invisible.

reviewed by Vadim at https://codereview.productengine.com/secondlife/r/136/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_bottomtray.xml      | 31 +++-------------------
 1 file changed, 4 insertions(+), 27 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 b6d7bf8dd0..c34a367c32 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -339,8 +339,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_height="28"
          top="0"
          name="im_well_panel"
-         width="35"
-         min_width="35"
+         width="37"
+         min_width="37"
          user_resize="false">
             <chiclet_im_well
              max_displayed_count="99"
@@ -388,22 +388,10 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          layout="topleft"
          min_height="28"
          top="0"
-         left_pad="3"
          name="notification_well_panel"
-         width="40"
-         min_width="40"
+         width="37"
+         min_width="37"
          user_resize="false">
-         <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="4"
-         top="0"
-         width="5" />
             <chiclet_notification
              flash_period="0.25"
              follows="right"
@@ -434,17 +422,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
               </button>
-         <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="4"
-         top="0"
-         width="5" />
 	    </chiclet_notification>
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3


From 58de782e08bb704aca5187c4983ee9c5698659a4 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 31 Mar 2010 16:01:50 +0300
Subject: Fixed bug EXT-4436 Clicking labels/text plays 'click' sound.

Disabled playing sound when a textbox is clicked.

Reviewed by Sam: https://codereview.productengine.com/secondlife/r/140/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/text.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/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 855584a0db..998ec5b170 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -15,6 +15,7 @@
       bg_visible="false" 
       border_visible="false" 
       hover="false" 
+      sound_flags="0"
       text_color="LabelTextColor"
       v_pad="0"
       max_length="4096"/>
-- 
cgit v1.2.3


From 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 31 Mar 2010 16:04:03 +0300
Subject: Fixed bug EXT-6628 IM floater: unable to open 'Pay' floater by click
 on 'Pay' button if floater height was reduced.

Reason: Height of the layout stack containing buttons was too small, hence
when you decrease the window height the bottommost buttons might move beyond
its container, becoming unclickable.

Fix: Increased height of the layout stack for it to reach the bottom of the
floater (occupying all visible area).

Reviewed by Sam: https://codereview.productengine.com/secondlife/r/141/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.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_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 88566ea037..7d7e21d4b0 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -16,7 +16,7 @@
      border_size="0"
      clip="false"
      follows="all"
-     height="168"
+     height="183"
      layout="topleft"
      left="5"
      name="button_stack"
-- 
cgit v1.2.3


From 1e74f573bbb7e9d3a6cf3134d3373a202912c721 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 31 Mar 2010 16:50:06 +0300
Subject: Fixed normal bug EXT-6505 (Certain gear icon buttons should not have
 chevrons)

- Created an icon that is just the gear icon, no dropdown chevron in places where there is no context menu, notably in: Nearby media popover, Master volume popover and Edit Floater

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_tools.xml         | 12 ++++++------
 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml |  4 ++--
 2 files 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 fd046c3695..8e7587f4cd 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2701,15 +2701,15 @@ even though the user gets a free copy.
 			<button
 			 follows="top|left"
 			 tool_tip="Edit this Media"
-			 height="18"
-			 image_disabled="OptionsMenu_Disabled"
-			 image_selected="OptionsMenu_Press"
-			 image_unselected="OptionsMenu_Off"
+			 height="12"
+			 image_disabled="Icon_Gear_Foreground"
+			 image_selected="Icon_Gear_Background"
+			 image_unselected="Icon_Gear_Press"
 			 layout="topleft"
 			 left_pad="10"
 			 name="edit_media"
-			 top_delta="0"
-			 width="18">
+			 top_delta="3"
+			 width="12">
 				<button.commit_callback
 				function="BuildTool.EditMedia"/>
 			</button>
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index cd66c56ca1..7b22b2cce1 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -32,9 +32,9 @@
    parameter="MuteAudio" />
   </slider>
   <button
-    left="7"
+    left="10"
     top_pad="9"
-    width="18"
+    width="12"
     height="12"
     follows="top|left"
     name="prefs_btn"
-- 
cgit v1.2.3


From 7263906f495407cdb49c80b2ad17f845fa2f1c81 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 31 Mar 2010 18:19:16 +0300
Subject: Fixed normal bug EXT-6541(snapshot preview opens before login curtain
 lifts) - changed the order of main view panels so the progress_view overlaps
 the snapshot_floater_view. Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/144/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 e8f9d65be5..b2e4a7ad95 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -163,15 +163,6 @@
                    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"
         mouse_opaque="false"
@@ -190,6 +181,15 @@
                            visible="false"
                            width="1024"/>
   </panel>
+  <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 69833aff50b1d1d360ff5568314d347dd3df40f5 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 1 Apr 2010 13:35:25 +0300
Subject: drafted out edit outfit panel XUI layout as major part of EXT-6548
 Edit Outfit: Clean up XUI to allow all elements to fit properly in the panel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/143/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 540 +++++++++++++--------
 .../default/xui/en/panel_outfits_inventory.xml     |   4 +-
 .../skins/default/xui/en/sidepanel_appearance.xml  |   9 +-
 3 files changed, 334 insertions(+), 219 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index d4924562fb..535e24f3d9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Side tray Outfit Edit panel -->
 <panel
-  background_visible="true"
-  border="false"
-	height="570"
-	follows="all"
-	label="Look Info"
-	layout="topleft"
-	name="look_info"
-	width="320">
+ background_visible="true"
+ border="false"
+ height="600"
+ follows="all"
+ label="Outfit Edit"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="outfit_edit"
+ top="0"
+ width="320">
+	
 	<panel.string
 		name="not_available">
 		(N\A)
@@ -16,218 +21,325 @@
 		name="unknown">
 		(unknown)
 	</panel.string>
-	<panel
-		background_visible="true"
-		bevel_style="none"
-		follows="left|top|right|bottom"
-		height="530"
-		label="Outfit"
-		layout="topleft"
-		name="look_management_panel"
-		width="320">
-        <panel
-          follows="left|right|top"
-            header_visible="false"
-            layout="topleft"
-            min_height="300"
-            name="look_group"
-            title="Outfit Group"
-          top="0">
+
+
+    <button
+     follows="top|left"
+     height="23"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     left="5"
+     tab_stop="false"
+     top="2"
+     width="23" />
+    <text
+     follows="top|right"
+     font="SansSerifHugeBold"
+     height="26"
+     layout="topleft"
+     left_pad="20"
+     name="title"
+     text_color="LtGray"
+     top="0"
+     value="Edit Outfit"
+     use_ellipses="true"
+     width="275" /> 
+
+<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+    <panel
+     bevel_style="none"
+     follows="top|left|right"
+     height="45"
+     label="bottom_panel"
+     layout="topleft"
+     left="5"
+     name="header_panel"
+     top_pad="5" 
+     width="300">
+        <icon
+         follows="left|top"
+         height="40"
+         image_name="t-shirt-image"
+         left="2"
+         mouse_opaque="false"
+         name="outfit_icon"
+         top="1"
+         scale_image="true"
+         visible="true"
+         width="35" />
             <panel
-                follows="left|right|top"
-                height="210"
-                layout="topleft"
-                top_pad="0"
-                name="look_info_group_bar"
-                width="295">
+             bevel_style="none"
+             follows="top|right"
+             height="40"
+             label="bottom_panel"
+             layout="topleft"
+             left_pad="10"
+             name="outfit_name_and_status"
+             top="2"
+             width="200">
                 <text
-                    type="string"
-                    length="1"
-                    follows="left|top"
-                    height="20"
-                    layout="topleft"
-                    mouse_opaque="false"
-                    name="curr_look_name"
-                    width="175">
-                    Look: [LOOK]
-                </text>
+                 follows="top|left|right"
+                 font="SansSerif"
+                 height="13"
+                 layout="topleft"
+                 name="status"
+                 text_color="Green"
+                 top="0"
+                 value="Editing..."
+                 use_ellipses="true"
+                 width="275" /> 
+                <text
+                 follows="bottom|left|right"
+                 font="SansSerifHugeBold"
+                 height="26"
+                 layout="topleft"
+                 name="curr_look_name"
+                 text_color="LtGray"
+                 top_pad="0"
+                 value="[Current Outfit]"
+                 use_ellipses="true"
+                 width="275" /> 
+            </panel>
+    </panel>
+
+
+<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+    <layout_stack
+     animate="false"
+     default_tab_group="2"
+     follows="all"
+     height="470"
+     width="300"
+     layout="topleft"
+     orientation="vertical"
+     name="im_panels"
+     tab_group="1"
+     top_pad="10"
+     left="5">
+        <layout_panel
+         layout="topleft"
+         follows="left|top|right"
+         height="220"
+         label="IM Control Panel"
+         min_height="100"
+         name="outfit_wearables_panel"
+         width="300"
+         auto_resize="true"
+         user_resize="true">
+
+            <scroll_list
+             width="300"
+             column_padding="0"
+             draw_heading="false"
+             draw_stripes="false"
+             follows="left|top|right|bottom"
+             layout="topleft"
+             name="look_items_list"
+             search_column="1"
+             sort_column="2"
+             left="0"
+             height="193"
+             top="0">
+                <scroll_list.columns
+                 label="Look Item"
+                 name="look_item"
+                 width="285" />
+                <scroll_list.columns
+                 label="Outfit Item Sort"
+                 width="0"
+                 sort_column="look_item_sort"
+                 name="look_item_sort" />
+            </scroll_list>
+
+            <panel
+             background_visible="true"
+             bevel_style="none"
+             follows="bottom|left|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="edit_panel"
+             top_pad="0"
+             width="300">
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Left_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
+                 layout="topleft"
+                 left="0"
+                 name="gear_menu_btn"
+                 top="1"
+                 width="31" />
                 <button
-                    follows="left|top"
-                    height="20"
-                    label="Wear"
-                    layout="topleft"
-                    name="wear_look_btn"
-                    left_pad="5"
-                    top_pad="-24"
-                    width="65" />
+                 is_toggle="true"
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="add_btn"
+                 top="1"
+                 width="31" />
                 <button
-                    follows="left|top"
-                    height="20"
-                    layout="topleft"
-                    left_pad="5"
-                    name="back_btn"
-                    width="20" />
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay=""
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="new_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="bottom|right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 name="trash_btn"
+                 right="-1"
+                 top="1"
+                 width="31" />
             </panel>
-        </panel>
+        </layout_panel>
+
+
+        <layout_panel
+         auto_resize="true"
+         default_tab_group="3"
+         height="250" 
+         min_height="120"
+         name="add_wearables_panel"
+         width="300"
+         tab_group="2"
+         user_resize="true">
+
+            <text
+             follows="top|left|right"
+             font="SansSerifBold"
+             height="13"
+             layout="topleft"
+             left="5"
+             name="status"
+             text_color="LtGray"
+             top="5"
+             value="Add Wearables"
+             use_ellipses="true"
+             width="275" />
+
+            <filter_editor
+             background_image="TextField_Search_Off"
+             follows="left|top|right"
+             font="SansSerif"
+             label="Filter"
+             layout="topleft"
+             left="5"
+             width="290"
+             height="20"
+             name="look_item_filter"
+             text_color="black"
+             text_pad_left="25" />
+
+            <inventory_panel
+             allow_multi_select="true"
+             border="false"
+             follows="left|top|right|bottom"
+             height="176"
+             layout="topleft"
+             left="0"
+             mouse_opaque="false"
+             name="inventory_items"
+             top_pad="5"
+             width="300"/>
 
-        <panel
-            follows="left|right|top"
-          height="200"
-          layout="topleft"
-          name="outfit_display"
-          top_pad="10"
-          width="320">
-          
-              <scroll_list
-                  width="285"
-                  column_padding="0"
-                  draw_heading="false"
-                  draw_stripes="false"
-                  follows="left|top|bottom|right"
-                  layout="topleft"
-                  name="look_items_list"
-                  search_column="1"
-                  sort_column="2"
-                  left="0"
-                  height="200"
-                  top_pad="0">
-                  <scroll_list.columns
-                      label="Look Item"
-                      name="look_item"
-                      width="285" />
-                  <scroll_list.columns
-                      label="Outfit Item Sort"
-                      width="0"
-                      sort_column="look_item_sort"
-                      name="look_item_sort" />
-              </scroll_list>
-              <button
-                  follows="left|top|right"
-                  height="20"
-                  label="-"
-                  left_pad="0"
-                  layout="topleft"
-                  name="edit_wearable_btn"
-                  width="20" />
-        </panel>
-        <panel
-          follows="all"
-            header_visible="false"
-            min_height="100"
-          left="0"
-            name="inventory_group"
-            title="My Inventory"
-          top_pad="10"
-          width="230">
             <panel
-                follows="left|right|top"
-                height="270"
-                name="lower_look_accordion"
-                width="295">
-                <panel
-                    follows="left|right|top"
-                    height="20"
-                    layout="topleft"
-                    name="inventory_bar"
-                    width="295">
-                    <text
-                        type="string"
-                        length="1"
-                        follows="left|top"
-                        height="20"
-                        layout="topleft"
-                        mouse_opaque="false"
-                        name="inventory_info_text"
-                        width="100">
-                        My Inventory
-                    </text>
-                    <combo_box
-                        follows="left"
-                        height="20"
-                        layout="topleft"
-                        left_pad="0"
-                        top_pad="-24"
-                        name="inventory_filter"
-                        tool_tip="Only show the selected inventory types"
-                        width="185" />
-                </panel>
-                <panel
-                    follows="left|right|top"
-                    height="20"
-                    layout="topleft"
-                    name="look_item_filter_bar"
-                    width="295">
-                    <filter_editor
-                        background_image="TextField_Search_Off"
-                        follows="left|top|right"
-                        font="SansSerif"
-                        label="Outfit Item Filter"
-                        layout="topleft"
-                        left="0"
-                        top_pad="0"
-                        width="270"
-                        height="20"
-                        name="look_item_filter"
-                        text_color="black"
-                        text_pad_left="25" />
-                </panel>
-                <panel
-                    follows="all"
-                    height="230"
-                    layout="topleft"
-                    name="inventory_panel"
-                    width="285">
-                    <inventory_panel
-                        allow_multi_select="true"
-                        border="true"
-                        follows="left|top|right|bottom"
-                        height="230"
-                        mouse_opaque="false"
-                        name="inventory_items"
-                        width="285"/>
-                </panel>
+             background_visible="true"
+             bevel_style="none"
+             follows="left|right|bottom"
+             height="27"
+             label="add_wearables_button_bar"
+             layout="topleft"
+             left="0"
+             name="add_wearables_button_bar"
+             top_pad="0"
+             width="300">
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Left_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
+                 layout="topleft"
+                 left="0"
+                 name="wearables_gear_menu_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay=""
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 label="F"
+                 layout="topleft"
+                 left_pad="1"
+                 name="folder_view_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay=""
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 label="L"
+                 layout="topleft"
+                 left_pad="1"
+                 name="list_view_btn"
+                 top="1"
+                 width="31" />
             </panel>
-        </panel>
-	</panel>
-	<panel
-		follows="left|right|bottom"
-		height="30"
-		layout="topleft"
-		left="5"
-		top_pad="0"
-		name="button_bar"
-		width="295">
-		<button
-			follows="top|left|right"
-			height="25"
-			label="Add"
-			left="0"
-			layout="topleft"
-			name="add_item_btn"
-			width="90" />
-		<button
-			follows="left|right"
-			height="25"
-			left_pad="0"
-			label="Remove"
-			layout="topleft"
-			name="remove_item_btn"
-			width="90" />
-		<button
-			follows="top|left|right"
-			height="25"
-			label="UP"
-			left_pad="0"
-			layout="topleft"
-			name="up_btn"
-			width="55" />
-		<button
-			follows="left|top|right"
-			height="25"
-			label="DOWN"
-			left_pad="0"
-			layout="topleft"
-			name="down_btn"
-			width="60" />
-	</panel>
+        </layout_panel>
+    </layout_stack>
+
+    <panel
+     follows="left|right|bottom"
+     height="30"
+     layout="topleft"
+     left="5"
+     top_pad="10"
+     name="save_revert_button_bar"
+     width="300">
+        <button
+         follows="bottom|left|right"
+         height="23"
+         label="Save"
+         left="0"
+         layout="topleft"
+         name="save_btn"
+         width="145" />
+        <button
+         follows="bottom|left|right"
+         height="23"
+         left_pad="15"
+         label="Revert"
+         layout="topleft"
+         name="revert_btn"
+         width="145" />
+    </panel>
 </panel>
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 66ef373168..b297ec1988 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -119,13 +119,13 @@
 	 <button
 	  follows="bottom|left"
 		height="23" 
-		label="M" 
+		label="Edit Outfit" 
 		layout="topleft"
         right="-140"
 		name="look_edit_btn"
         top="26"
         visible="false" 
-		width="20" />
+		width="50" />
 	 </panel>
        
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 735635f1a0..20a1de59fc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -104,12 +104,15 @@ width="333">
    <panel
    class="panel_outfit_edit"
    filename="panel_outfit_edit.xml"
+   height="550"
    follows="all"
    layout="topleft"
-   left="0"
+   left="5"
+   min_height="410"
    name="panel_outfit_edit"
-   top="35"
-   visible="false" />
+   top="5"
+   visible="false" 
+   width="320"/>
    <panel
    class="panel_edit_wearable"
    filename="panel_edit_wearable.xml"
-- 
cgit v1.2.3


From 9c0087c0a68b37718dbedae0e5a99b8a5920c318 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 1 Apr 2010 14:07:45 +0300
Subject: Fixed normal bug EXT-6023 - [HARD CODED]? Side Bar : "More" link
 inside "Profile" and "Pick" According to ticket, files in "widgets" folder
 are not localized and "more_label" is not a translatable attribute. Replaced
 "more_label" with "label". expandable_text "More" text is accessible through
 "textbox.label" attribute. Added "textbox.label" to every expandable_text to
 make "More" text localizable.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_event.xml               | 1 +
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 +
 indra/newview/skins/default/xui/en/panel_landmark_info.xml         | 1 +
 indra/newview/skins/default/xui/en/panel_my_profile.xml            | 3 +++
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml        | 1 +
 indra/newview/skins/default/xui/en/panel_place_profile.xml         | 1 +
 indra/newview/skins/default/xui/en/panel_profile.xml               | 3 +++
 indra/newview/skins/default/xui/en/widgets/expandable_text.xml     | 2 +-
 8 files changed, 12 insertions(+), 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 0255e202fb..d9c9d63c72 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -244,6 +244,7 @@
        layout="topleft"
        left="6"
        name="event_desc"
+       textbox.label="More"
        width="322">
        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
     </layout_panel>
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 996e28c575..af3315ebfe 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
@@ -65,6 +65,7 @@
      left="103"
      name="description"
      textbox.max_length="1024"
+     textbox.label="More"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index befeb182f9..31ba539c44 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -133,6 +133,7 @@
              layout="topleft"
              left="10"
              name="description"
+             textbox.label="More"
              top_pad="10"
              value="Du waltz die spritz"
              width="280" />
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 4386475cf1..5e41d65720 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -117,6 +117,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.label="More"
                textbox.show_context_menu="true"
                name="sl_description_edit"
                top_pad="-3"
@@ -172,6 +173,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.label="More"
                textbox.show_context_menu="true"
                name="fl_description_edit"
                top_pad="-3"
@@ -313,6 +315,7 @@
             name="sl_groups"
           top_pad="0"
             translate="false"
+            textbox.label="More"
             textbox.show_context_menu="true"
             width="298"
             expanded_bg_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 715dc5f23c..41651edaa0 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -65,6 +65,7 @@
      left="103"
      name="picture_descr"
      textbox.max_length="1024"
+     textbox.label="More"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
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 9e5ef10d42..c1c1e54b47 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -275,6 +275,7 @@
              layout="topleft"
              left="5"
              name="description"
+             textbox.label="More"
              top_pad="10"
              value="Du waltz die spritz"
              width="300" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 34ec64b8af..a666608103 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -107,6 +107,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.label="More"
                textbox.show_context_menu="true"
                name="sl_description_edit"
                top_pad="-3"
@@ -152,6 +153,7 @@
                layout="topleft"
                left="107"
                textbox.max_length="512"
+               textbox.label="More"
                textbox.show_context_menu="true"
                name="fl_description_edit"
                top_pad="-3"
@@ -291,6 +293,7 @@
             left="7"
             name="sl_groups"
             textbox.max_length="512"
+            textbox.label="More"
             textbox.show_context_menu="true"
             top_pad="0"
             translate="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index d9b6387f0d..6190ea7872 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -5,7 +5,7 @@
   allow_html="true"
   allow_scroll="true"
   bg_visible="false"
-  more_label="More" 
+  label="More" 
   follows="left|top|right"
   name="text"
   read_only="true"
-- 
cgit v1.2.3


From 985d422210defe6f975bd9b0c301f877c75a86d6 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 1 Apr 2010 14:30:09 +0300
Subject: forgot to commit visible=false of Add Wearables panel as part of
 EXT-6548 Edit Outfit: Clean up XUI to allow all elements to fit properly in
 the panel

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/143/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.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/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 535e24f3d9..4d3ee07195 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -224,7 +224,8 @@
          name="add_wearables_panel"
          width="300"
          tab_group="2"
-         user_resize="true">
+         user_resize="true"
+         visible="false">
 
             <text
              follows="top|left|right"
-- 
cgit v1.2.3


From c6cdd40c4eab2bb413ce778e6659f27c1d04c008 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 1 Apr 2010 14:58:24 +0300
Subject: fixed EXT-6373 Consecutive offer messages are unreadable in the IM
 log replaced [NAME] with [NAME_SLURL] in friendship offer notification;

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8501143fe6..3d41989e54 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5167,7 +5167,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    icon="notify.tga"
    name="OfferFriendship"
    type="offer">
-[NAME] is offering friendship.
+[NAME_SLURL] is offering friendship.
 
 [MESSAGE]
 
-- 
cgit v1.2.3


From b98ebdecda66a1f08e74321cb255e39edfbc47dd Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 1 Apr 2010 17:24:50 +0300
Subject: Fixed reopened major bug (EXT-5106) Side panel list view toolbars are
 missing background art. - Made toolbars look connected to the respective
 lists. - Fixed tab container background in Inventory side panel.

Tab container reserves 1 pixel for the border width so we have to use top_pad="-1" to move the toolbar 1 pixel up to physically connect them.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_landmarks.xml     |  2 +-
 .../newview/skins/default/xui/en/panel_main_inventory.xml  | 12 ++++++------
 .../skins/default/xui/en/panel_outfits_inventory.xml       |  4 ++--
 indra/newview/skins/default/xui/en/panel_people.xml        | 14 +++++++++-----
 .../skins/default/xui/en/panel_teleport_history.xml        |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 639e5d30ef..a7e87f2a1e 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -16,7 +16,7 @@
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
      follows="all"
-     height="369"
+     height="373"
      layout="topleft"
      left="3"
      name="landmarks_accordion"
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 bef62f48e0..6c81107dde 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -411,13 +411,13 @@
      top="+31"
      width="303" />
     <tab_container
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
+       bg_alpha_color="DkGray"
+       bg_opaque_color="DkGray"
        background_visible="true"
        background_opaque="true"
        follows="all"
        halign="center"
-       height="306"
+       height="311"
        layout="topleft"
        left="7"
        name="inventory filter tabs"
@@ -434,7 +434,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="295"
+         height="310"
          label="MY INVENTORY"
          help_topic="my_inventory_tab"
          layout="topleft"
@@ -451,7 +451,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="293"
+         height="310"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
@@ -466,7 +466,7 @@
      follows="left|right|bottom"
      height="27"
      layout="topleft"
-     top_pad="4"
+     top_pad="-1"
      left="10"
      name="bottom_panel"
      width="310">
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 b297ec1988..f9ad525642 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -14,7 +14,7 @@
  border="false">
    <tab_container
      follows="all"
-     height="497"
+     height="501"
      layout="topleft"
      left="7"
      name="appearance_tabs"
@@ -58,7 +58,7 @@
 	  height="73"
 	  layout="topleft"
 	  left="9"
-	  top_pad="3"
+	  top_pad="-1"
 	  visible="true"
 	  name="bottom_panel"
 	  width="310">
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 85841da48f..6152dd1587 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -81,7 +81,7 @@
        		 bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              ignore_online_status="true"
              layout="topleft"
              left="3"
@@ -97,6 +97,7 @@
              layout="topleft"
              left="3"
              name="bottom_panel"
+             top_pad="0"
              width="313">
              <button
              follows="bottom|left"
@@ -156,7 +157,7 @@
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              name="friends_accordion"
@@ -204,6 +205,7 @@
              layout="topleft"
              left="3"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
@@ -237,7 +239,7 @@
              	 layout="topleft"
              	 left_pad="1"
              	 name="dummy_icon"
-             	 width="210"
+             	 width="209"
              />
                 <button
                  follows="bottom|left"
@@ -287,7 +289,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              name="group_list"
@@ -303,6 +305,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              layout="topleft"
              left="0"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
@@ -372,7 +375,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
        		 bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              multi_select="true"
@@ -388,6 +391,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              layout="topleft"
              left="0"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index cbcaf1a58c..21addb8e6f 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -6,7 +6,7 @@
      bg_alpha_color="DkGray">     
     <accordion
      follows="left|top|right|bottom"
-     height="369"
+     height="373"
      layout="topleft"
      left="3"
      top="0"
-- 
cgit v1.2.3


From 7b0dab508363e5da1ab180bdd0f8d63f1985105c Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 1 Apr 2010 17:28:36 +0300
Subject: (work in progress) Update for LLAccordionCtrl arrange single
 expansion. Found this issue while working on EXT-6564(Fix wearable editing
 panels) - Every single_expansion accordion is treated like "fit_parent" is
 set to "true" after changes made in 9805 : e6c5f3b23be1 (fix for EXT-5128
 Groups accordions should all appear on-screen w/out scrolling (open accordion
 should fill space)). Updated accordion to take into account "fit_parent"
 property.

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

--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 701a14e1c5..789d69bc68 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
@@ -98,6 +98,7 @@ background_visible="true"
      left="0"
      top="0"
      single_expansion="true"
+     fit_parent="true"
      follows="all"
      layout="topleft"
      name="groups_accordion">
-- 
cgit v1.2.3


From 3c036ef49b1e8690f5efe29393a4990e117e5bfe Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 1 Apr 2010 17:41:47 +0300
Subject: (work in progress) EXT-6564(major) - Fix wearable editing panels
 Fixed Edit Shape panel layout: - fixed widget positioning according to spec -
 added gear button bar - fixed accordion positioning - fixed parameter list
 positioning

TODO:
- fix parameter panel positioning
- apply changes to the rest of wearable panels

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_shape.xml      | 86 ++++++++++++++++------
 .../skins/default/xui/en/panel_edit_wearable.xml   | 64 ++++++++++++++--
 .../skins/default/xui/en/panel_scrolling_param.xml | 32 +++++++-
 .../skins/default/xui/en/sidepanel_appearance.xml  |  2 +-
 4 files changed, 153 insertions(+), 31 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index 45c4b92338..9a3b5c26ec 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
 	 left="10"
 	 name="edit_shape_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-		 border="true"
+		 border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
 		 follows="top|left"
 		 height="50"
 		 left="10"
 		 layout="topleft"
 		 name="avatar_sex_panel"
-		 top="10"
-		 width="293" >
+		 top="0"
+		 width="313" >
    			<text 
 			 follows="top|left"
 			 height="16"
 			 layout="topleft"
 			 left="10"
 			 name="gender_text"
-			 width="303">
+			 width="313">
 				Gender:
 			</text>
 		   <radio_group
-			 follows="all"
+			 follows="left|top|right"
 			 left="10"
-             height="34"
+             height="28"
              layout="topleft"
              name="sex_radio"
 			 top_pad="3"
-			 width="200" >
+			 width="303" >
                 <radio_item
 					follows="all"
                  height="16"
@@ -51,21 +56,41 @@
                  width="82" />
             </radio_group>
 	 </panel>
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="345"
+         label="Shirt"
+         layout="topleft"
+		 left="10"
+         name="accordion_panel"
+		 top_pad="10"
+         width="313">
 	 <accordion
-		follows="left|top|right|bottom"
-		height ="330"
-		left="10"
+        layout="topleft"
+		follows="all"
+		height ="345"
+		left="0"
 		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+		top="0"
+        single_expansion="true"
+        fit_parent="false"
+		width="313">
 		<accordion_tab
 			layout="topleft"
 			min_height="150"
 			name="shape_body_tab"
+            fit_panel="false"
 			title="Body">
 			<scrolling_panel_list
+                layout="topleft" 
 				follows="all"
 				left="0"
+                height="300"
 				name="shape_body_param_list"
 				top="0"
 				width="303" />
@@ -73,11 +98,13 @@
 		<accordion_tab
 			layout="topleft"
 			min_height="150"
+            fit_panel="false"
 			name="shape_head_tab"
 			title="Head">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
-				left="0"
+				left="10"
 				name="shape_head_param_list"
 				top="0"
 				width="303" />
@@ -85,9 +112,11 @@
 		<accordion_tab
 			layout="topleft"
 			min_height="150"
+            fit_panel="false"
 			name="shape_eyes_tab"
 			title="Eyes">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_eyes_param_list"
@@ -97,9 +126,11 @@
 		<accordion_tab
 			layout="topleft"
 			min_height="150"
+            fit_panel="false"
 			name="shape_ears_tab"
 			title="Ears">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_ears_param_list"
@@ -110,8 +141,10 @@
 			layout="topleft"
 			min_height="150"
 			name="shape_nose_tab"
+            fit_panel="false"
 			title="Nose">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_nose_param_list"
@@ -122,8 +155,10 @@
 			layout="topleft"
 			min_height="150"
 			name="shape_mouth_tab"
+            fit_panel="false"
 			title="Mouth">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_mouth_param_list"
@@ -134,8 +169,10 @@
 			layout="topleft"
 			min_height="150"
 			name="shape_chin_tab"
+            fit_panel="false"
 			title="Chin">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_chin_param_list"
@@ -146,8 +183,10 @@
 			layout="topleft"
 			min_height="150"
 			name="shape_torso_tab"
+            fit_panel="false"
 			title="Torso">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_torso_param_list"
@@ -158,8 +197,10 @@
 			layout="topleft"
 			min_height="150"
 			name="shape_legs_tab"
+            fit_panel="false"
 			title="Legs">
-			<scrolling_panel_list
+           <scrolling_panel_list
+                layout="topleft"
 				follows="all"
 				left="0"
 				name="shape_legs_param_list"
@@ -167,5 +208,6 @@
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index f76a56bda4..b4272bb10a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -150,7 +150,11 @@ left="0"
 	 value="Editing Shape"
 	 width="270" />
      <panel
-         border="true"
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
          follows="top|left"
          height="60"
          label="Shirt"
@@ -335,30 +339,76 @@ left="0"
 			 visible="false"
 			 width="333" />
 	 </panel>
+     <panel
+        follows="left|right|bottom"
+        height="38"
+        label="gear_buttom_panel"
+        layout="bottom|left|right"
+        left="0"
+        bottom="25"
+        name="gear_buttom_panel"
+        width="333">
+        <button
+            follows="bottom|left"
+            tool_tip="Options"
+            height="18"
+            image_disabled="OptionsMenu_Disabled"
+            image_selected="OptionsMenu_Press"
+            image_unselected="OptionsMenu_Off"
+            layout="topleft"
+            left="10"
+            name="friends_viewsort_btn"
+            top="10"
+            width="18" />
+        <button
+            follows="bottom|left"
+            height="18"
+            image_selected="AddItem_Press"
+            image_unselected="AddItem_Off"
+            image_disabled="AddItem_Disabled"
+            layout="topleft"
+            left_pad="10"
+            name="add_btn"
+            tool_tip="TODO"
+            width="18" />
+        <button
+            follows="bottom|left"
+            height="18"
+            image_selected="TrashItem_Press"
+            image_unselected="TrashItem_Off"
+            image_disabled="TrashItem_Disabled"
+            layout="topleft"
+            left_pad="10"
+            right="-10"
+            name="del_btn"
+            tool_tip="TODO"
+            top_delta="0"
+            width="18" />
+     </panel>
 	 <panel
-		 follows="all"
+		 follows="bottom|left|right"
 		 height="25"
 		 layout="bottom|left|right"
 		 left="0"
 		 name="button_panel"
-		 top_pad="10"
+		 bottom="5"
 		 width="333" >
 		 <button
 			 follows="bottomleft"
 			 layout="topleft"
 			 height="23"
 			 label="Save As"
-			 left="10"
+			 left="8"
 			 name="save_as_button"
 			 top="0"
-			 width="100" />
+			 width="153" />
 		 <button
 			 follows="bottomleft"
 			 layout="topleft"
 			 height="23"
 			 label="Revert"
-			 left_pad="10"
+			 left_pad="7"
 			 name="revert_button"
-			 width="100" />
+			 width="153" />
 	 </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 44afadf65a..f9c86fc75b 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -5,7 +5,7 @@
  left="0"
  name="LLScrollingPanelParam"
  top="152"
- width="270">
+ width="290">
     <text
      follows="left|top"
      height="16"
@@ -46,6 +46,36 @@
      width="128">
         Loading...
     </text>
+    <view_border 
+     layout="topleft"
+     follows="left|top"
+     left="2"
+     top="0"
+     width="132"
+     height="132"
+     thickness="2"
+     shadow_light_color="LtGray_50"
+     highlight_light_color="LtGray_50"
+     highlight_dark_color="LtGray_50"
+     shadow_dark_color="LtGray_50"
+     bevel_style="in"
+     name="left_border"
+    />
+    <view_border 
+     layout="topleft"
+     follows="left|top"
+     left_pad="2"
+     top_delta="0"
+     width="132"
+     height="132"
+     thickness="2"
+     shadow_light_color="LtGray_50"
+     highlight_light_color="LtGray_50"
+     highlight_dark_color="LtGray_50"
+     shadow_dark_color="LtGray_50"
+     bevel_style="in"
+     name="right_border"
+    />
     <button
      enabled="false"
      height="132"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 20a1de59fc..c5efa2e221 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -120,6 +120,6 @@ width="333">
    layout="topleft"
    left="0"
    name="panel_edit_wearable"
-   top="35"
+   top="0"
    visible="false" />
 </panel>
-- 
cgit v1.2.3


From 5db663c87ef816fc09b0f93266d871d05833df8c Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Thu, 1 Apr 2010 18:47:35 +0300
Subject: Partial fix for normal bug EXT-6612 (End Call button in 1:1 IMs
 should be labeled End Call (not Leave Call))

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.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_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 7d7e21d4b0..29c6a17c31 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -150,7 +150,7 @@
             <button
              follows="left|top|right"
              height="23"
-             label="Leave Call"
+             label="End Call"
              name="end_call_btn"
              width="100" />
         </layout_panel>
-- 
cgit v1.2.3


From bb4c1384ac4113775cf69e2de521ad150733fa67 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Thu, 1 Apr 2010 12:05:17 -0700
Subject: EXT-3531 - Ctrl-P does not work reliably on login forgot
 menu_edit.xml

---
 indra/newview/skins/default/xui/en/menu_edit.xml | 89 ++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_edit.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
new file mode 100644
index 0000000000..68f3cb532c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_edit.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu create_jump_keys="true"
+      label="Edit"
+      name="Edit"
+      visible="false">
+  <menu_item_call
+   label="Undo"
+   name="Undo"
+   shortcut="control|Z">
+    <menu_item_call.on_click
+     function="Edit.Undo" />
+    <menu_item_call.on_enable
+     function="Edit.EnableUndo" />
+  </menu_item_call>
+  <menu_item_call
+   label="Redo"
+   name="Redo"
+   shortcut="control|Y">
+    <menu_item_call.on_click
+     function="Edit.Redo" />
+    <menu_item_call.on_enable
+     function="Edit.EnableRedo" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call
+   label="Cut"
+   name="Cut"
+   shortcut="control|X">
+    <menu_item_call.on_click
+     function="Edit.Cut" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCut" />
+  </menu_item_call>
+  <menu_item_call
+   label="Copy"
+   name="Copy"
+   shortcut="control|C">
+    <menu_item_call.on_click
+     function="Edit.Copy" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCopy" />
+  </menu_item_call>
+  <menu_item_call
+   label="Paste"
+   name="Paste"
+   shortcut="control|V">
+    <menu_item_call.on_click
+     function="Edit.Paste" />
+    <menu_item_call.on_enable
+     function="Edit.EnablePaste" />
+  </menu_item_call>
+  <menu_item_call
+   label="Delete"
+   name="Delete"
+   shortcut="Del">
+    <menu_item_call.on_click
+     function="Edit.Delete" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDelete" />
+  </menu_item_call>
+  <menu_item_call
+   label="Duplicate"
+   name="Duplicate"
+   shortcut="control|D">
+    <menu_item_call.on_click
+     function="Edit.Duplicate" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDuplicate" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call
+   label="Select All"
+   name="Select All"
+   shortcut="control|A">
+    <menu_item_call.on_click
+     function="Edit.SelectAll" />
+    <menu_item_call.on_enable
+     function="Edit.EnableSelectAll" />
+  </menu_item_call>
+  <menu_item_call
+   label="Deselect"
+   name="Deselect"
+   shortcut="control|E">
+    <menu_item_call.on_click
+     function="Edit.Deselect" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDeselect" />
+  </menu_item_call>
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3


From e254aa6dc6dcd3ba7369de5231dec16a570701a8 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Thu, 1 Apr 2010 12:06:16 -0700
Subject: EXT-3531 - Ctrl-P does not work reliably on login deprecated
 handle_edit_keys_directly and moved edit menu out of menu_viewer and
 menu_login

---
 .../skins/default/xui/en/alert_line_editor.xml     |   1 -
 .../skins/default/xui/en/floater_about_land.xml    |   1 -
 .../skins/default/xui/en/floater_buy_land.xml      |   1 -
 .../default/xui/en/floater_outfit_save_as.xml      |   1 -
 .../default/xui/en/floater_preview_notecard.xml    |   1 -
 .../skins/default/xui/en/floater_ui_preview.xml    |   3 -
 .../default/xui/en/floater_wearable_save_as.xml    |   1 -
 indra/newview/skins/default/xui/en/menu_login.xml  | 135 ++---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 582 ++-------------------
 indra/newview/skins/default/xui/en/panel_login.xml |   3 -
 .../skins/default/xui/en/panel_place_profile.xml   |   1 -
 .../default/xui/en/panel_preferences_setup.xml     |   1 -
 .../skins/default/xui/en/panel_region_covenant.xml |   1 -
 .../skins/default/xui/en/panel_script_ed.xml       |   1 -
 .../skins/default/xui/en/widgets/line_editor.xml   |   1 -
 15 files changed, 87 insertions(+), 647 deletions(-)

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

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 97991153d8..82bf5fc8da 100644
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <line_editor
   select_on_focus="false"
-  handle_edit_keys_directly="false"
   revert_on_esc="true"
   commit_on_focus_lost="true"
   ignore_tab="true"
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 51bd7a0a16..59f1889808 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -636,7 +636,6 @@ Leyla Linden               </text>
              length="1"
              enabled="false"
              follows="all"
-             handle_edit_keys_directly="true"
              height="200"
              layout="topleft"
              left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 125b080519..df44b61632 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -356,7 +356,6 @@ supports [AMOUNT2] objects
      length="1"
      enabled="false"
      follows="top|right"
-     handle_edit_keys_directly="false" 
      height="237"
      layout="topleft"
      left="444"
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 a2938e8574..1d73d516d0 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
@@ -45,7 +45,6 @@ as a new Outfit:
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     handle_edit_keys_directly="true"
      height="23"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index e9099211a3..14c0081c0d 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -72,7 +72,6 @@
      max_length="65536"
      name="Notecard Editor"
      allow_html="false" 
-     handle_edit_keys_directly="true"
      tab_group="1"
      top="46"
      width="392"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 3a981adfdf..3b10a57c50 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -238,7 +238,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="100"
@@ -278,7 +277,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="100"
@@ -320,7 +318,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="65"
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 b4b57f2dbc..71812bd1a6 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
@@ -44,7 +44,6 @@
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     handle_edit_keys_directly="true"
      height="23"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index ba74104594..4655fa8c46 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -29,14 +29,6 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
-<!-- Edit menu merged into the Me menu above
-    <menu
-     create_jump_keys="true"
-     label="Edit"
-     name="Edit"
-     width="153">
-    </menu>
--->
     <menu
      create_jump_keys="true"
      label="Help"
@@ -59,105 +51,24 @@
              parameter="sl_about" />
         </menu_item_call>
     </menu>
+    <menu_item_check
+      label="Show Debug Menu"
+      name="Show Debug Menu"
+      visible="false" 
+      shortcut="control|alt|D">
+      <on_check
+       function="CheckControl"
+       parameter="UseDebugMenus" />
+      <on_click
+       function="ToggleControl"
+       parameter="UseDebugMenus" />
+    </menu_item_check>
     <menu
       visible="false"
      create_jump_keys="true"
      label="Debug"
      name="Debug"
      tear_off="true">
-      <!-- Need a copy of the edit menu here so keyboard shortcuts like
-           control-C work to copy text at login screen and About dialog (for QA)
-      -->
-      <menu
-       create_jump_keys="true"
-       label="Edit"
-       name="Edit"
-       tear_off="true">
-        <menu_item_call
-         label="Undo"
-         name="Undo"
-         shortcut="control|Z">
-          <menu_item_call.on_click
-           function="Edit.Undo" />
-          <menu_item_call.on_enable
-           function="Edit.EnableUndo" />
-        </menu_item_call>
-        <menu_item_call
-         label="Redo"
-         name="Redo"
-         shortcut="control|Y">
-          <menu_item_call.on_click
-           function="Edit.Redo" />
-          <menu_item_call.on_enable
-           function="Edit.EnableRedo" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_call
-         label="Cut"
-         name="Cut"
-         shortcut="control|X">
-          <menu_item_call.on_click
-           function="Edit.Cut" />
-          <menu_item_call.on_enable
-           function="Edit.EnableCut" />
-        </menu_item_call>
-        <menu_item_call
-         label="Copy"
-         name="Copy"
-         shortcut="control|C">
-          <menu_item_call.on_click
-           function="Edit.Copy" />
-          <menu_item_call.on_enable
-           function="Edit.EnableCopy" />
-        </menu_item_call>
-        <menu_item_call
-         label="Paste"
-         name="Paste"
-         shortcut="control|V">
-          <menu_item_call.on_click
-           function="Edit.Paste" />
-          <menu_item_call.on_enable
-           function="Edit.EnablePaste" />
-        </menu_item_call>
-        <menu_item_call
-         label="Delete"
-         name="Delete"
-         shortcut="Del">
-          <menu_item_call.on_click
-           function="Edit.Delete" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDelete" />
-        </menu_item_call>
-        <menu_item_call
-         label="Duplicate"
-         name="Duplicate"
-         shortcut="control|D">
-          <menu_item_call.on_click
-           function="Edit.Duplicate" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDuplicate" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_call
-         label="Select All"
-         name="Select All"
-         shortcut="control|A">
-          <menu_item_call.on_click
-           function="Edit.SelectAll" />
-          <menu_item_call.on_enable
-           function="Edit.EnableSelectAll" />
-        </menu_item_call>
-        <menu_item_call
-         label="Deselect"
-         name="Deselect"
-         shortcut="control|E">
-          <menu_item_call.on_click
-           function="Edit.Deselect" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDeselect" />
-        </menu_item_call>
-      </menu>
-      <menu_item_separator />
       <menu_item_call
          label="Show Debug Settings"
          name="Debug Settings">
@@ -270,5 +181,27 @@
            function="Advanced.WebBrowserTest"
            parameter="http://join.secondlife.com/"/>
         </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_check
+        label="Show Grid Picker"
+        name="Show Grid Picker"
+        visible="false" 
+        shortcut="control|shift|G">
+        <on_check
+         function="CheckControl"
+         parameter="ForceShowGrid" />
+        <on_click
+         function="ToggleControl"
+         parameter="ForceShowGrid" />
+      </menu_item_check>
+      <menu_item_call
+        label="Show Notifications Console"
+        name="Show Notifications Console"
+        visible="false"
+        shortcut="control|shift|5">
+        <on_click
+         function="Floater.Toggle"
+         parameter="notifications_console" />
+      </menu_item_call>
     </menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a08bc16066..43f594ca5a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2,16 +2,13 @@
 <menu_bar
  bg_visible="false"
  follows="left|top|right"
- layout="topleft"
  name="Main Menu">
     <menu
      label="Me"
-     layout="topleft"
      name="Me"
      tear_off="true">
         <menu_item_call
          label="Preferences"
-         layout="topleft"
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
@@ -20,7 +17,6 @@
         </menu_item_call>
          <menu_item_call
              label="My Dashboard"
-             layout="topleft"
              name="Manage My Account">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -29,16 +25,13 @@
       </menu_item_call>
         <menu_item_call
          label="Buy L$"
-         layout="topleft"
          name="Buy and Sell L$">
             <menu_item_call.on_click
              function="BuyCurrency" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="My Profile"
-         layout="topleft"
          name="Profile">
             <menu_item_call.on_click
              function="ShowAgentProfile"
@@ -46,7 +39,6 @@
         </menu_item_call>
         <menu_item_call
          label="My Appearance"
-         layout="topleft"
          name="Appearance">
             <menu_item_call.on_click
              function="CustomizeAvatar" />
@@ -56,7 +48,6 @@
         <menu_item_check
          label="My Inventory"
          name="Inventory"
-         layout="topleft"
          shortcut="control|shift|I"
 		 visible="false">
             <menu_item_check.on_check
@@ -69,7 +60,6 @@
         <menu_item_check
          label="My Inventory"
          name="ShowSidetrayInventory"
-         layout="topleft"
          shortcut="control|I"
 		 visible="true">
             <menu_item_check.on_check
@@ -81,7 +71,6 @@
         </menu_item_check>
         <menu_item_check
          label="My Gestures"
-         layout="topleft"
          name="Gestures"
          shortcut="control|G">
             <menu_item_check.on_check
@@ -93,21 +82,17 @@
         </menu_item_check>
         <menu
          label="My Status"
-         layout="topleft"
          name="Status"
          tear_off="true">
             <menu_item_call
              label="Away"
-             layout="topleft"
              name="Set Away">
                 <menu_item_call.on_click
                  function="World.SetAway" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft"/>
+          <menu_item_separator/>
             <menu_item_call
              label="Busy"
-             layout="topleft"
              name="Set Busy">
                 <menu_item_call.on_click
                  function="World.SetBusy"/>
@@ -115,7 +100,6 @@
         </menu>
         <menu_item_call
          label="Request Admin Status"
-         layout="topleft"
          name="Request Admin Options"
          shortcut="control|alt|G"
 		 visible="false">
@@ -124,18 +108,15 @@
         </menu_item_call>
         <menu_item_call
          label="Leave Admin Status"
-         layout="topleft"
          name="Leave Admin Options"
          shortcut="control|alt|shift|G"
 		 visible="false">
             <menu_item_call.on_click
              function="Advanced.LeaveAdminStatus" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="Quit [APP_NAME]"
-         layout="topleft"
          name="Quit"
          shortcut="control|Q">
             <menu_item_call.on_click
@@ -144,12 +125,10 @@
     </menu>
     <menu
      label="Communicate"
-     layout="topleft"
      name="Communicate"
      tear_off="true">
         <menu_item_call
          label="My Friends"
-         layout="topleft"
          name="My Friends"
          shortcut="control|shift|F">
             <menu_item_call.on_click
@@ -158,24 +137,20 @@
             </menu_item_call>
         <menu_item_call
          label="My Groups"
-         layout="topleft"
          name="My Groups">
             <menu_item_call.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <!--menu_item_call
          label="Chat"
-         layout="topleft"
          name="Chat">
             <menu_item_call.on_click
              function="World.Chat" />
         </menu_item_call-->
         <menu_item_check
          label="Nearby Chat"
-         layout="topleft"
          name="Nearby Chat"
          shortcut="control|H"
          use_mac_ctrl="true">
@@ -188,7 +163,6 @@
         </menu_item_check>
         <menu_item_call
          label="Nearby People"
-         layout="topleft"
          name="Active Speakers"
          shortcut="control|shift|A">
             <menu_item_call.on_click
@@ -198,12 +172,10 @@
     </menu>
     <menu
      label="World"
-     layout="topleft"
      name="World"
      tear_off="true">
             <menu_item_check
          label="Mini-Map"
-         layout="topleft"
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
@@ -215,7 +187,6 @@
         </menu_item_check>
          <menu_item_check
          label="World Map"
-         layout="topleft"
          name="World Map"
          shortcut="control|M"
          use_mac_ctrl="true">
@@ -228,7 +199,6 @@
         </menu_item_check>
         <menu_item_call
          label="Snapshot"
-         layout="topleft"
          name="Take Snapshot"
          shortcut="control|shift|S">
             <menu_item_call.on_click
@@ -237,7 +207,6 @@
         </menu_item_call>
       <menu_item_call
              label="Landmark This Place"
-             layout="topleft"
              name="Create Landmark Here">
                 <menu_item_call.on_click
                  function="World.CreateLandmark" />
@@ -247,12 +216,10 @@
       <menu
            create_jump_keys="true"
            label="Place Profile"
-           layout="topleft"
            name="Land"
            tear_off="true">
         <menu_item_call
          label="About Land"
-         layout="topleft"
          name="About Land">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -260,18 +227,15 @@
         </menu_item_call>
         <menu_item_call
          label="Region/Estate"
-         layout="topleft"
          name="Region/Estate">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="region_info" />
         </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
              label="Buy This Land"
-             layout="topleft"
              name="Buy Land">
                 <menu_item_call.on_click
                  function="Land.Buy" />
@@ -280,7 +244,6 @@
             </menu_item_call>
         <menu_item_call
              label="My Land"
-             layout="topleft"
              name="My Land">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -289,12 +252,10 @@
         <menu
            create_jump_keys="true"
            label="Show"
-           layout="topleft"
            name="LandShow"
            tear_off="true">
          <menu_item_check
          label="Move Controls"
-         layout="topleft"
          name="Movement Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -304,7 +265,6 @@
         </menu_item_check>
         <menu_item_check
          label="View Controls"
-         layout="topleft"
          name="Camera Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -314,7 +274,6 @@
         </menu_item_check>
           <menu_item_check
              label="Ban Lines"
-             layout="topleft"
              name="Ban Lines">
             <menu_item_check.on_check
                control="ShowBanLines" />
@@ -324,7 +283,6 @@
           </menu_item_check>
            <menu_item_check
                  label="Beacons"
-                 layout="topleft"
                  name="beacons"
                  shortcut="control|alt|shift|N">
                     <menu_item_check.on_check
@@ -336,7 +294,6 @@
                 </menu_item_check>
           <menu_item_check
              label="Property Lines"
-             layout="topleft"
              name="Property Lines"
              shortcut="control|alt|shift|P">
             <menu_item_check.on_check
@@ -347,7 +304,6 @@
           </menu_item_check>
           <menu_item_check
              label="Land Owners"
-             layout="topleft"
              name="Land Owners">
             <menu_item_check.on_check
                control="ShowParcelOwners" />
@@ -374,11 +330,9 @@
                control="NavBarShowParcelProperties" />
           </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
 	    <menu_item_call
 	     label="Teleport Home"
-	     layout="topleft"
 	     name="Teleport Home"
 	     shortcut="control|shift|H">
 		<menu_item_call.on_click
@@ -388,7 +342,6 @@
 	    </menu_item_call>
             <menu_item_call
              label="Set Home to Here"
-             layout="topleft"
              name="Set Home to Here">
                 <menu_item_call.on_click
                  function="World.SetHomeLocation" />
@@ -397,7 +350,6 @@
             </menu_item_call>
     <!--    <menu_item_check
          label="Show Navigation Bar"
-         layout="topleft"
          name="ShowNavbarNavigationPanel">
            <menu_item_check.on_click
              function="ToggleControl"
@@ -408,7 +360,6 @@
         </menu_item_check>
        <menu_item_check
          label="Show Favorites Bar"
-         layout="topleft"
          name="ShowNavbarFavoritesPanel">
            <menu_item_check.on_click
              function="ToggleControl"
@@ -417,19 +368,15 @@
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />-->
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
+        <menu_item_separator/>
     <menu
          create_jump_keys="true"
          label="Sun"
-         layout="topleft"
          name="Environment Settings"
          tear_off="true">
             <menu_item_call
              label="Sunrise"
-             layout="topleft"
              name="Sunrise">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -437,7 +384,6 @@
             </menu_item_call>
             <menu_item_call
              label="Midday"
-             layout="topleft"
              name="Noon"
              shortcut="control|shift|Y">
                 <menu_item_call.on_click
@@ -446,7 +392,6 @@
             </menu_item_call>
             <menu_item_call
              label="Sunset"
-             layout="topleft"
              name="Sunset"
              shortcut="control|shift|N">
                 <menu_item_call.on_click
@@ -455,7 +400,6 @@
             </menu_item_call>
             <menu_item_call
              label="Midnight"
-             layout="topleft"
              name="Midnight">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -463,17 +407,14 @@
             </menu_item_call>
             <menu_item_call
              label="Estate Time"
-             layout="topleft"
              name="Revert to Region Default">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
                  parameter="default" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Environment Editor"
-             layout="topleft"
              name="Environment Editor">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -484,13 +425,11 @@
     <menu
      create_jump_keys="true"
      label="Build"
-     layout="topleft"
      name="BuildTools"
      tear_off="true"
      visible="true">
        <menu_item_check
          label="Build"
-         layout="topleft"
          name="Show Build Tools"
          shortcut="control|B">
             <menu_item_check.on_check
@@ -503,12 +442,10 @@
        <menu
           create_jump_keys="true"
           label="Select Build Tool"
-          layout="topleft"
           name="Select Tool"
           tear_off="true">
          <menu_item_call
 			label="Focus Tool"
-			layout="topleft"
 			name="Focus"
 			shortcut="control|1">
            <menu_item_call.on_click
@@ -517,7 +454,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Move Tool"
-			layout="topleft"
 			name="Move"
 			shortcut="control|2">
            <menu_item_call.on_click
@@ -526,7 +462,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Edit Tool"
-			layout="topleft"
 			name="Edit"
 			shortcut="control|3">
            <menu_item_call.on_click
@@ -535,7 +470,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Create Tool"
-			layout="topleft"
 			name="Create"
 			shortcut="control|4">
            <menu_item_call.on_click
@@ -544,7 +478,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Land Tool"
-			layout="topleft"
 			name="Land"
 			shortcut="control|5">
            <menu_item_call.on_click
@@ -552,112 +485,8 @@
               parameter="land" />
          </menu_item_call>
 	   </menu>
-        <menu
-         create_jump_keys="true"
-         label="Edit"
-         layout="topleft"
-         name="Edit"
-         tear_off="true">
-            <menu_item_call
-             label="Undo"
-             layout="topleft"
-             name="Undo"
-             shortcut="control|Z">
-                <menu_item_call.on_click
-                 function="Edit.Undo" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableUndo" />
-            </menu_item_call>
-            <menu_item_call
-             label="Redo"
-             layout="topleft"
-             name="Redo"
-             shortcut="control|Y">
-                <menu_item_call.on_click
-                 function="Edit.Redo" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableRedo" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Cut"
-             layout="topleft"
-             name="Cut"
-             shortcut="control|X">
-                <menu_item_call.on_click
-                 function="Edit.Cut" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableCut" />
-            </menu_item_call>
-            <menu_item_call
-             label="Copy"
-             layout="topleft"
-             name="Copy"
-             shortcut="control|C">
-                <menu_item_call.on_click
-                 function="Edit.Copy" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableCopy" />
-            </menu_item_call>
-            <menu_item_call
-             label="Paste"
-             layout="topleft"
-             name="Paste"
-             shortcut="control|V">
-                <menu_item_call.on_click
-                 function="Edit.Paste" />
-                <menu_item_call.on_enable
-                 function="Edit.EnablePaste" />
-            </menu_item_call>
-            <menu_item_call
-             label="Delete"
-             layout="topleft"
-             name="Delete"
-             shortcut="Del">
-                <menu_item_call.on_click
-                 function="Edit.Delete" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDelete" />
-            </menu_item_call>
-            <menu_item_call
-             label="Duplicate"
-             layout="topleft"
-             name="Duplicate"
-             shortcut="control|D">
-                <menu_item_call.on_click
-                 function="Edit.Duplicate" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDuplicate" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Select All"
-             layout="topleft"
-             name="Select All"
-             shortcut="control|A">
-                <menu_item_call.on_click
-                 function="Edit.SelectAll" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableSelectAll" />
-            </menu_item_call>
-            <menu_item_call
-             label="Deselect"
-             layout="topleft"
-             name="Deselect"
-             shortcut="control|E">
-                <menu_item_call.on_click
-                 function="Edit.Deselect" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDeselect" />
-            </menu_item_call>
-        </menu>
-        <menu_item_separator
-           layout="topleft" />
         <menu_item_call
            label="Link"
-           layout="topleft"
            name="Link"
            shortcut="control|L">
           <menu_item_call.on_click
@@ -667,7 +496,6 @@
         </menu_item_call>
         <menu_item_call
            label="Unlink"
-           layout="topleft"
            name="Unlink"
            shortcut="control|shift|L">
           <menu_item_call.on_click
@@ -677,7 +505,6 @@
         </menu_item_call>
         <menu_item_check
              label="Edit Linked Parts"
-             layout="topleft"
              name="Edit Linked Parts">
                 <menu_item_check.on_check
                  control="EditLinkedParts" />
@@ -687,11 +514,9 @@
                 <menu_item_check.on_enable
                  function="Tools.EnableToolNotPie" />
             </menu_item_check>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
            label="Focus on Selection"
-           layout="topleft"
            name="Focus on Selection"
            shortcut="H">
           <menu_item_call.on_click
@@ -702,7 +527,6 @@
         </menu_item_call>
         <menu_item_call
            label="Zoom to Selection"
-           layout="topleft"
            name="Zoom to Selection"
            shortcut="shift|H">
           <menu_item_call.on_click
@@ -711,17 +535,14 @@
           <menu_item_call.on_enable
              function="Tools.SomethingSelectedNoHUD" />
         </menu_item_call>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Object"
-         layout="topleft"
          name="Object"
          tear_off="true">
           <menu_item_call
              label="Buy"
-             layout="topleft"
              name="Menu Object Buy">
             <menu_item_call.on_click
                function="Tools.BuyOrTake"/>
@@ -732,7 +553,6 @@
           </menu_item_call>
           <menu_item_call
              label="Take"
-             layout="topleft"
              name="Menu Object Take">
             <menu_item_call.on_click
                function="Tools.BuyOrTake"/>
@@ -743,7 +563,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Take Copy"
-			 layout="topleft"
 			 name="Take Copy">
 			<menu_item_call.on_click
                function="Tools.TakeCopy" />
@@ -752,7 +571,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Save Back to My Inventory"
-			 layout="topleft"
 			 name="Save Object Back to My Inventory">
 			<menu_item_call.on_click
                function="Tools.SaveToInventory" />
@@ -761,7 +579,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Save Back to Object Contents"
-			 layout="topleft"
 			 name="Save Object Back to Object Contents">
 			<menu_item_call.on_click
                function="Tools.SaveToObjectInventory" />
@@ -772,12 +589,10 @@
         <menu
            create_jump_keys="true"
            label="Scripts"
-           layout="topleft"
            name="Scripts"
            tear_off="true">
           <menu_item_call
              label="Recompile Scripts (Mono)"
-             layout="topleft"
              name="Mono">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -787,7 +602,6 @@
           </menu_item_call>
           <menu_item_call
              label="Recompile Scripts (LSL)"
-             layout="topleft"
              name="LSL">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -797,7 +611,6 @@
           </menu_item_call>
           <menu_item_call
              label="Reset Scripts"
-             layout="topleft"
              name="Reset Scripts">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -807,7 +620,6 @@
           </menu_item_call>
           <menu_item_call
              label="Set Scripts to Running"
-             layout="topleft"
              name="Set Scripts to Running">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -817,7 +629,6 @@
           </menu_item_call>
           <menu_item_call
              label="Set Scripts to Not Running"
-             layout="topleft"
              name="Set Scripts to Not Running">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -826,17 +637,14 @@
                function="EditableSelected" />
           </menu_item_call>
         </menu>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Options"
-         layout="topleft"
          name="Options"
          tear_off="true">
             <menu_item_call
              label="Set Default Upload Permissions"
-             layout="topleft"
              name="perm prefs">
                 <menu_item_call.on_click
                  function="Floater.Toggle"
@@ -844,7 +652,6 @@
             </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
-	       layout="topleft"
 	       name="DebugPermissions">
 			  <menu_item_check.on_check
 				 function="CheckControl"
@@ -853,11 +660,9 @@
 				 function="ToggleControl"
 				 parameter="DebugPermissions" />
 			</menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
                  label="Select Only My Objects"
-                 layout="topleft"
                  name="Select Only My Objects">
                     <menu_item_check.on_check
                      control="SelectOwnedOnly" />
@@ -867,7 +672,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Select Only Movable Objects"
-                 layout="topleft"
                  name="Select Only Movable Objects">
                     <menu_item_check.on_check
                      control="SelectMovableOnly" />
@@ -877,18 +681,15 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
-                 layout="topleft"
                  name="Select By Surrounding">
                     <menu_item_check.on_check
                      control="RectangleSelectInclusive" />
                     <menu_item_check.on_click
                      function="Tools.SelectBySurrounding" />
             </menu_item_check>
-          <menu_item_separator
-           layout="topleft" />
+          <menu_item_separator/>
                 <menu_item_check
                  label="Show Hidden Selection"
-                 layout="topleft"
                  name="Show Hidden Selection">
                     <menu_item_check.on_check
                      control="RenderHiddenSelections" />
@@ -897,7 +698,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Show Light Radius for Selection"
-                 layout="topleft"
                  name="Show Light Radius for Selection">
                     <menu_item_check.on_check
                      control="RenderLightRadius" />
@@ -906,7 +706,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Show Selection Beam"
-                 layout="topleft"
                  name="Show Selection Beam">
                     <menu_item_check.on_check
                      control="ShowSelectionBeam" />
@@ -914,11 +713,9 @@
                      function="ToggleControl"
                      parameter="ShowSelectionBeam" />
                 </menu_item_check>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
                 <menu_item_check
                  label="Snap to Grid"
-                 layout="topleft"
                  name="Snap to Grid"
                  shortcut="G">
                     <menu_item_check.on_check
@@ -931,7 +728,6 @@
                 </menu_item_check>
                 <menu_item_call
                  label="Snap Object XY to Grid"
-                 layout="topleft"
                  name="Snap Object XY to Grid"
                  shortcut="shift|X">
                     <menu_item_call.on_click
@@ -941,7 +737,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Use Selection for Grid"
-                 layout="topleft"
                  name="Use Selection for Grid"
                  shortcut="shift|G">
                     <menu_item_call.on_click
@@ -951,7 +746,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Grid Options"
-                 layout="topleft"
                  name="Grid Options"
                  shortcut="control|shift|B">
                     <menu_item_call.on_click
@@ -964,12 +758,10 @@
         <menu
          create_jump_keys="true"
          label="Select Linked Parts"
-         layout="topleft"
          name="Select Linked Parts"
          tear_off="true">
             <menu_item_call
              label="Select Next Part"
-             layout="topleft"
              name="Select Next Part"
 	     shortcut="control|.">
                 <menu_item_call.on_click
@@ -980,7 +772,6 @@
             </menu_item_call>
             <menu_item_call
              label="Select Previous Part"
-             layout="topleft"
              name="Select Previous Part"
 	     shortcut="control|,">
                 <menu_item_call.on_click
@@ -991,7 +782,6 @@
             </menu_item_call>
             <menu_item_call
              label="Include Next Part"
-             layout="topleft"
              name="Include Next Part"
 	     shortcut="control|shift|.">
                 <menu_item_call.on_click
@@ -1002,7 +792,6 @@
             </menu_item_call>
             <menu_item_call
              label="Include Previous Part"
-             layout="topleft"
              name="Include Previous Part"
 	     shortcut="control|shift|,">
                 <menu_item_call.on_click
@@ -1015,48 +804,40 @@
     </menu>
     <menu
      label="Help"
-     layout="topleft"
      name="Help"
      tear_off="true">
         <menu_item_call
          label="[SECOND_LIFE] Help"
-         layout="topleft"
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
              function="ShowHelp"
              parameter="f1_help" />
         </menu_item_call>
-  <!--      <menu_item_call
+        <menu_item_call
          label="Tutorial"
-         layout="topleft"
          name="Tutorial">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
-        <menu_item_separator
-             layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
              label="Report Abuse"
-             layout="topleft"
              name="Report Abuse">
                 <menu_item_call.on_click
                  function="ReportAbuse" />
             </menu_item_call>
         <menu_item_call
              label="Report Bug"
-             layout="topleft"
              name="Report Bug">
                 <menu_item_call.on_click
                  function="ShowHelp"
                  parameter="report_bug" />
             </menu_item_call>
-        <menu_item_separator
-             layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="About [APP_NAME]"
-         layout="topleft"
          name="About Second Life">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -1065,20 +846,28 @@
     </menu>
     <menu
      label="Advanced"
-     layout="topleft"
      name="Advanced"
      tear_off="true"
      visible="false">
+        <menu_item_check
+         label="Show Advanced Menu"
+         name="Show Advanced Menu"
+         shortcut="control|alt|D">
+          <on_check
+           function="CheckControl"
+           parameter="UseDebugMenus" />
+          <on_click
+           function="ToggleControl"
+           parameter="UseDebugMenus" />
+        </menu_item_check>
         <menu_item_call
          label="Stop Animating Me"
-         layout="topleft"
          name="Stop Animating My Avatar">
             <menu_item_call.on_click
              function="Tools.StopAllAnimations" />
         </menu_item_call>
         <menu_item_call
          label="Rebake Textures"
-         layout="topleft"
          name="Rebake Texture"
          shortcut="control|alt|R">
             <menu_item_call.on_click
@@ -1086,7 +875,6 @@
         </menu_item_call>
         <menu_item_call
            label="Set UI Size to Default"
-           layout="topleft"
            name="Set UI Size to Default">
           <menu_item_call.on_click
              function="View.DefaultUISize" />
@@ -1101,7 +889,6 @@
         <menu_item_separator/>
         <menu_item_check
          label="Limit Select Distance"
-         layout="topleft"
          name="Limit Select Distance">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1112,7 +899,6 @@
         </menu_item_check>
         <menu_item_check
          label="Disable Camera Constraints"
-         layout="topleft"
          name="Disable Camera Distance">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1121,11 +907,9 @@
              function="ToggleControl"
              parameter="DisableCameraConstraints" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="High-res Snapshot"
-         layout="topleft"
          name="HighResSnapshot">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1136,7 +920,6 @@
         </menu_item_check>
         <menu_item_check
          label="Quiet Snapshots to Disk"
-         layout="topleft"
          name="QuietSnapshotsToDisk">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1147,7 +930,6 @@
         </menu_item_check>
         <menu_item_check
          label="Compress Snapshots to Disk"
-         layout="topleft"
          name="CompressSnapshotsToDisk">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1156,17 +938,14 @@
              function="ToggleControl"
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Performance Tools"
-         layout="topleft"
          name="Performance Tools"
          tear_off="true">
             <menu_item_call
              label="Lag Meter"
-             layout="topleft"
              name="Lag Meter">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -1174,7 +953,6 @@
             </menu_item_call>
             <menu_item_check
              label="Statistics Bar"
-             layout="topleft"
              name="Statistics Bar"
              shortcut="control|shift|1">
                 <menu_item_check.on_check
@@ -1186,7 +964,6 @@
             </menu_item_check>
       <menu_item_check
         label="Show Avatar Rendering Cost"
-        layout="topleft"
         name="Avatar Rendering Cost">
            <menu_item_check.on_check
             function="Advanced.CheckInfoDisplay"
@@ -1199,12 +976,10 @@
         <menu
          create_jump_keys="true"
          label="Highlighting and Visibility"
-         layout="topleft"
          name="Highlighting and Visibility"
          tear_off="true">
          <menu_item_check
                  label="Cheesy Beacon"
-                 layout="topleft"
                  name="Cheesy Beacon">
                     <menu_item_check.on_check
                      function="CheckControl"
@@ -1215,7 +990,6 @@
                 </menu_item_check>
             <menu_item_check
              label="Hide Particles"
-             layout="topleft"
              name="Hide Particles"
              shortcut="control|alt|shift|=">
                 <menu_item_check.on_check
@@ -1227,7 +1001,6 @@
             </menu_item_check>
             <menu_item_check
              label="Hide Selected"
-             layout="topleft"
              name="Hide Selected">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -1238,7 +1011,6 @@
             </menu_item_check>
             <menu_item_check
              label="Highlight Transparent"
-             layout="topleft"
              name="Highlight Transparent"
              shortcut="control|alt|T">
                 <menu_item_check.on_check
@@ -1248,7 +1020,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show HUD Attachments"
-             layout="topleft"
              name="Show HUD Attachments"
              shortcut="alt|shift|H">
                 <menu_item_check.on_check
@@ -1258,7 +1029,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Mouselook Crosshairs"
-             layout="topleft"
              name="ShowCrosshairs">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -1270,12 +1040,10 @@
   <!-- <menu
          create_jump_keys="true"
          label="Hover Tips"
-         layout="topleft"
          name="Hover Tips"
          tear_off="true">
             <menu_item_check
              label="Show Tips"
-             layout="topleft"
              name="Show Tips"
              shortcut="control|shift|T">
                 <menu_item_check.on_check
@@ -1283,11 +1051,9 @@
                 <menu_item_check.on_click
                  function="View.ShowHoverTips" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />-->
+            <menu_item_separator/>
             <menu_item_check
              label="Show Land Tooltips"
-             layout="topleft"
              name="Land Tips">
                 <menu_item_check.on_check
                  control="ShowLandHoverTip" />
@@ -1297,9 +1063,8 @@
                 <menu_item_check.on_enable
                  function="View.CheckShowHoverTips" />
             </menu_item_check>
- <!--           <menu_item_check
+           <menu_item_check
              label="Show Tips On All Objects"
-             layout="topleft"
              name="Tips On All Objects">
                 <menu_item_check.on_check
                  control="ShowAllObjectHoverTip" />
@@ -1316,12 +1081,10 @@
         <menu
          create_jump_keys="true"
          label="Rendering Types"
-         layout="topleft"
          name="Rendering Types"
          tear_off="true">
             <menu_item_check
              label="Simple"
-             layout="topleft"
              name="Simple"
              shortcut="control|alt|shift|1">
                 <menu_item_check.on_check
@@ -1333,7 +1096,6 @@
             </menu_item_check>
             <menu_item_check
              label="Alpha"
-             layout="topleft"
              name="Alpha"
              shortcut="control|alt|shift|2">
                 <menu_item_check.on_check
@@ -1345,7 +1107,6 @@
             </menu_item_check>
             <menu_item_check
              label="Tree"
-             layout="topleft"
              name="Tree"
              shortcut="control|alt|shift|3">
                 <menu_item_check.on_check
@@ -1357,7 +1118,6 @@
             </menu_item_check>
             <menu_item_check
              label="Avatars"
-             layout="topleft"
              name="Character"
              shortcut="control|alt|shift|4">
                 <menu_item_check.on_check
@@ -1369,7 +1129,6 @@
             </menu_item_check>
             <menu_item_check
              label="SurfacePath"
-             layout="topleft"
              name="SurfacePath"
              shortcut="control|alt|shift|5">
                 <menu_item_check.on_check
@@ -1381,7 +1140,6 @@
             </menu_item_check>
             <menu_item_check
              label="Sky"
-             layout="topleft"
              name="Sky"
              shortcut="control|alt|shift|6">
                 <menu_item_check.on_check
@@ -1393,7 +1151,6 @@
             </menu_item_check>
             <menu_item_check
              label="Water"
-             layout="topleft"
              name="Water"
              shortcut="control|alt|shift|7">
                 <menu_item_check.on_check
@@ -1405,7 +1162,6 @@
             </menu_item_check>
             <menu_item_check
              label="Ground"
-             layout="topleft"
              name="Ground"
              shortcut="control|alt|shift|8">
                 <menu_item_check.on_check
@@ -1417,7 +1173,6 @@
             </menu_item_check>
             <menu_item_check
              label="Volume"
-             layout="topleft"
              name="Volume"
              shortcut="control|alt|shift|9">
                 <menu_item_check.on_check
@@ -1429,7 +1184,6 @@
             </menu_item_check>
             <menu_item_check
              label="Grass"
-             layout="topleft"
              name="Grass"
              shortcut="control|alt|shift|0">
                 <menu_item_check.on_check
@@ -1441,7 +1195,6 @@
             </menu_item_check>
             <menu_item_check
              label="Clouds"
-             layout="topleft"
              name="Clouds"
              shortcut="control|alt|shift|-">
                 <menu_item_check.on_check
@@ -1453,7 +1206,6 @@
             </menu_item_check>
             <menu_item_check
              label="Particles"
-             layout="topleft"
              name="Particles"
              shortcut="control|alt|shift|=">
                 <menu_item_check.on_check
@@ -1465,7 +1217,6 @@
             </menu_item_check>
             <menu_item_check
              label="Bump"
-             layout="topleft"
              name="Bump"
              shortcut="control|alt|shift|\">
                 <menu_item_check.on_check
@@ -1479,12 +1230,10 @@
         <menu
          create_jump_keys="true"
          label="Rendering Features"
-         layout="topleft"
          name="Rendering Features"
          tear_off="true">
             <menu_item_check
              label="UI"
-             layout="topleft"
              name="UI"
              shortcut="control|alt|F1">
                 <menu_item_check.on_check
@@ -1496,7 +1245,6 @@
             </menu_item_check>
             <menu_item_check
              label="Selected"
-             layout="topleft"
              name="Selected"
              shortcut="control|alt|F2">
                 <menu_item_check.on_check
@@ -1508,7 +1256,6 @@
             </menu_item_check>
             <menu_item_check
              label="Highlighted"
-             layout="topleft"
              name="Highlighted"
              shortcut="control|alt|F3">
                 <menu_item_check.on_check
@@ -1520,7 +1267,6 @@
             </menu_item_check>
             <menu_item_check
              label="Dynamic Textures"
-             layout="topleft"
              name="Dynamic Textures"
              shortcut="control|alt|F4">
                 <menu_item_check.on_check
@@ -1532,7 +1278,6 @@
             </menu_item_check>
             <menu_item_check
              label="Foot Shadows"
-             layout="topleft"
              name="Foot Shadows"
              shortcut="control|alt|F5">
                 <menu_item_check.on_check
@@ -1544,7 +1289,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fog"
-             layout="topleft"
              name="Fog"
              shortcut="control|alt|F6">
                 <menu_item_check.on_check
@@ -1556,7 +1300,6 @@
             </menu_item_check>
             <menu_item_check
              label="Test FRInfo"
-             layout="topleft"
              name="Test FRInfo"
              shortcut="control|alt|F8">
                 <menu_item_check.on_check
@@ -1568,7 +1311,6 @@
             </menu_item_check>
             <menu_item_check
              label="Flexible Objects"
-             layout="topleft"
              name="Flexible Objects"
              shortcut="control|alt|F9">
                 <menu_item_check.on_check
@@ -1581,7 +1323,6 @@
         </menu>
         <menu_item_check
          label="Run Multiple Threads"
-         layout="topleft"
          name="Run Multiple Threads">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1592,7 +1333,6 @@
         </menu_item_check>
         <menu_item_call
          label="Clear Group Cache"
-         layout="topleft"
          name="ClearGroupCache">
             <menu_item_call.on_click
              function="Advanced.ClearGroupCache"
@@ -1600,7 +1340,6 @@
         </menu_item_call>
         <menu_item_check
          label="Mouse Smoothing"
-         layout="topleft"
          name="Mouse Smoothing">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1609,17 +1348,14 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          label="Shortcuts"
-         layout="topleft"
          name="Shortcuts"
          tear_off="true"
          visible="false">
           <menu_item_call
              label="Image (L$[COST])..."
-             layout="topleft"
              name="Upload Image"
              shortcut="control|U">
             <menu_item_call.on_click
@@ -1630,7 +1366,6 @@
             </menu_item_call>
             <menu_item_check
                label="Search"
-               layout="topleft"
                name="Search"
                shortcut="control|F">
             <menu_item_check.on_check
@@ -1643,7 +1378,6 @@
             <menu_item_call
              enabled="false"
              label="Release Keys"
-             layout="topleft"
              name="Release Keys">
                 <menu_item_call.on_click
                  function="Tools.ReleaseKeys"
@@ -1654,16 +1388,13 @@
             </menu_item_call>
             <menu_item_call
              label="Set UI Size to Default"
-             layout="topleft"
              name="Set UI Size to Default">
                 <menu_item_call.on_click
                  function="View.DefaultUISize" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Always Run"
-             layout="topleft"
              name="Always Run"
              shortcut="control|R">
                 <menu_item_check.on_check
@@ -1673,7 +1404,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fly"
-             layout="topleft"
              name="Fly"
              shortcut="Home">
                 <menu_item_check.on_check
@@ -1683,11 +1413,9 @@
                 <menu_item_check.on_enable
                  function="Agent.enableFlying" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Close Window"
-             layout="topleft"
              name="Close Window"
              shortcut="control|W">
                 <menu_item_call.on_click
@@ -1697,7 +1425,6 @@
             </menu_item_call>
             <menu_item_call
              label="Close All Windows"
-             layout="topleft"
              name="Close All Windows"
              shortcut="control|shift|W">
                 <menu_item_call.on_click
@@ -1705,22 +1432,18 @@
                 <menu_item_call.on_enable
                  function="File.EnableCloseAllWindows" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Snapshot to Disk"
-             layout="topleft"
              name="Snapshot to Disk"
              shortcut="control|`"
              use_mac_ctrl="true">
                 <menu_item_call.on_click
                  function="File.TakeSnapshotToDisk" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Mouselook"
-             layout="topleft"
              name="Mouselook"
              shortcut="M">
                 <menu_item_call.on_click
@@ -1730,7 +1453,6 @@
             </menu_item_call>
             <menu_item_check
              label="Joystick Flycam"
-             layout="topleft"
              name="Joystick Flycam"
              shortcut="alt|shift|F">
                 <menu_item_check.on_check
@@ -1742,7 +1464,6 @@
             </menu_item_check>
             <menu_item_call
              label="Reset View"
-             layout="topleft"
              name="Reset View"
              shortcut="Esc">
                 <menu_item_call.on_click
@@ -1750,7 +1471,6 @@
             </menu_item_call>
             <menu_item_call
              label="Look at Last Chatter"
-             layout="topleft"
              name="Look at Last Chatter"
              shortcut="control|\">
                 <menu_item_call.on_click
@@ -1758,17 +1478,14 @@
                 <menu_item_call.on_enable
                  function="View.EnableLastChatter" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu
              create_jump_keys="true"
              label="Select Build Tool"
-             layout="topleft"
              name="Select Tool"
              tear_off="true">
                 <menu_item_call
                  label="Focus Tool"
-                 layout="topleft"
                  name="Focus"
                  shortcut="control|1">
                     <menu_item_call.on_click
@@ -1777,7 +1494,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Move Tool"
-                 layout="topleft"
                  name="Move"
                  shortcut="control|2">
                     <menu_item_call.on_click
@@ -1786,7 +1502,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Edit Tool"
-                 layout="topleft"
                  name="Edit"
                  shortcut="control|3">
                     <menu_item_call.on_click
@@ -1795,7 +1510,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Create Tool"
-                 layout="topleft"
                  name="Create"
                  shortcut="control|4">
                     <menu_item_call.on_click
@@ -1804,7 +1518,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Land Tool"
-                 layout="topleft"
                  name="Land"
                  shortcut="control|5">
                     <menu_item_call.on_click
@@ -1812,11 +1525,9 @@
                      parameter="land" />
                 </menu_item_call>
             </menu>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Zoom In"
-             layout="topleft"
              name="Zoom In"
              shortcut="control|0">
                 <menu_item_call.on_click
@@ -1824,7 +1535,6 @@
             </menu_item_call>
             <menu_item_call
              label="Zoom Default"
-             layout="topleft"
              name="Zoom Default"
              shortcut="control|9">
                 <menu_item_call.on_click
@@ -1832,17 +1542,14 @@
             </menu_item_call>
             <menu_item_call
              label="Zoom Out"
-             layout="topleft"
              name="Zoom Out"
              shortcut="control|8">
                 <menu_item_call.on_click
                  function="View.ZoomOut" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Toggle Fullscreen"
-             layout="topleft"
              name="Toggle Fullscreen"
              >
                <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
@@ -1850,11 +1557,9 @@
                  function="View.Fullscreen" />
             </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="Show Debug Settings"
-         layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
              function="Advanced.ShowDebugSettings"
@@ -1862,7 +1567,6 @@
         </menu_item_call>
      <menu_item_check
          label="Show Develop Menu"
-         layout="topleft"
          name="Debug Mode"
          shortcut="control|alt|Q">
             <menu_item_check.on_check
@@ -1872,23 +1576,21 @@
              function="ToggleControl"
              parameter="QAMode" />
         </menu_item_check>
+    
     </menu>
     <menu
      create_jump_keys="true"
      label="Develop"
-     layout="topleft"
      name="Develop"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Consoles"
-         layout="topleft"
          name="Consoles"
          tear_off="true">
             <menu_item_check
              label="Texture Console"
-             layout="topleft"
              name="Texture Console"
              shortcut="control|shift|3"
              use_mac_ctrl="true">
@@ -1901,7 +1603,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Console"
-             layout="topleft"
              name="Debug Console"
              shortcut="control|shift|4"
              use_mac_ctrl="true">
@@ -1914,7 +1615,6 @@
             </menu_item_check>
             <menu_item_call
              label="Notifications Console"
-             layout="topleft"
              name="Notifications"
              shortcut="control|shift|5">
               <menu_item_call.on_click
@@ -1923,7 +1623,6 @@
             </menu_item_call>
             <menu_item_check
                label="Texture Size Console"
-               layout="topleft"
                name="Texture Size"
                shortcut="control|shift|6">
               <menu_item_check.on_check
@@ -1935,7 +1634,6 @@
             </menu_item_check>
             <menu_item_check
                label="Texture Category Console"
-               layout="topleft"
                name="Texture Category"
                shortcut="control|shift|7">
               <menu_item_check.on_check
@@ -1947,7 +1645,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fast Timers"
-             layout="topleft"
              name="Fast Timers"
              shortcut="control|shift|9"
              use_mac_ctrl="true">
@@ -1960,7 +1657,6 @@
             </menu_item_check>
             <menu_item_check
              label="Memory"
-             layout="topleft"
              name="Memory"
              shortcut="control|shift|0"
              use_mac_ctrl="true">
@@ -1971,11 +1667,9 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Region Info to Debug Console"
-             layout="topleft"
              name="Region Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
@@ -1983,7 +1677,6 @@
             </menu_item_call>
             <menu_item_call
              label="Group Info to Debug Console"
-             layout="topleft"
              name="Group Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
@@ -1991,17 +1684,14 @@
             </menu_item_call>
             <menu_item_call
              label="Capabilities Info to Debug Console"
-             layout="topleft"
              name="Capabilities Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
                  parameter="capabilities" />
             </menu_item_call>
-            <menu_item_separator
-         layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Camera"
-             layout="topleft"
              name="Camera">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2012,7 +1702,6 @@
             </menu_item_check>
             <menu_item_check
              label="Wind"
-             layout="topleft"
              name="Wind">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2023,7 +1712,6 @@
             </menu_item_check>
             <menu_item_check
              label="FOV"
-             layout="topleft"
              name="FOV">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2034,7 +1722,6 @@
             </menu_item_check>
             <menu_item_check
              label="Badge"
-             layout="topleft"
              name="Badge"
 			 shortcut="alt|control|shift|h">
                 <menu_item_check.on_check
@@ -2048,12 +1735,10 @@
         <menu
          create_jump_keys="true"
          label="Show Info"
-         layout="topleft"
          name="Display Info"
          tear_off="true">
             <menu_item_check
              label="Show Time"
-             layout="topleft"
              name="Show Time">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2064,7 +1749,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Render Info"
-             layout="topleft"
              name="Show Render Info">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2075,7 +1759,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Matrices"
-             layout="topleft"
              name="Show Matrices">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2086,7 +1769,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Color Under Cursor"
-             layout="topleft"
              name="Show Color Under Cursor">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2095,11 +1777,9 @@
                  function="ToggleControl"
                  parameter="DebugShowColor" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Show Updates to Objects"
-             layout="topleft"
              name="Show Updates"
              shortcut="control|alt|shift|U">
                 <menu_item_check.on_check
@@ -2109,17 +1789,14 @@
                  function="Advanced.ToggleShowObjectUpdates" />
             </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Force an Error"
-         layout="topleft"
          name="Force Errors"
          tear_off="true">
             <menu_item_call
              label="Force Breakpoint"
-             layout="topleft"
              name="Force Breakpoint"
              shortcut="control|alt|shift|B">
                 <menu_item_call.on_click
@@ -2127,49 +1804,42 @@
             </menu_item_call>
             <menu_item_call
              label="Force LLError And Crash"
-             layout="topleft"
              name="Force LLError And Crash">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorLlerror" />
             </menu_item_call>
             <menu_item_call
              label="Force Bad Memory Access"
-             layout="topleft"
              name="Force Bad Memory Access">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorBadMemoryAccess" />
             </menu_item_call>
             <menu_item_call
              label="Force Infinite Loop"
-             layout="topleft"
              name="Force Infinite Loop">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorInfiniteLoop" />
             </menu_item_call>
             <menu_item_call
              label="Force Driver Crash"
-             layout="topleft"
              name="Force Driver Carsh">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorDriverCrash" />
             </menu_item_call>
             <menu_item_call
              label="Force Software Exception"
-             layout="topleft"
              name="Force Software Exception">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
              label="Force Disconnect Viewer"
-             layout="topleft"
              name="Force Disconnect Viewer">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorDisconnectViewer" />
             </menu_item_call>
             <menu_item_call
              label="Simulate a Memory Leak"
-             layout="topleft"
              name="Memory Leaking Simulation">
                <menu_item_call.on_click
                 function="Floater.Show"
@@ -2179,12 +1849,10 @@
         <menu
          create_jump_keys="true"
          label="Render Tests"
-         layout="topleft"
          name="Render Tests"
          tear_off="true">
             <menu_item_check
              label="Camera Offset"
-             layout="topleft"
              name="Camera Offset">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2195,7 +1863,6 @@
             </menu_item_check>
             <menu_item_check
              label="Randomize Framerate"
-             layout="topleft"
              name="Randomize Framerate">
                 <menu_item_check.on_check
                  function="Advanced.CheckRandomizeFramerate"
@@ -2205,7 +1872,6 @@
             </menu_item_check>
             <menu_item_check
              label="Periodic Slow Frame"
-             layout="topleft"
              name="Periodic Slow Frame">
                 <menu_item_check.on_check
                  function="Advanced.CheckPeriodicSlowFrame"
@@ -2216,7 +1882,6 @@
             </menu_item_check>
             <menu_item_check
              label="Frame Test"
-             layout="topleft"
              name="Frame Test">
                 <menu_item_check.on_check
                  function="Advanced.CheckFrameTest"
@@ -2228,12 +1893,10 @@
       <menu
         create_jump_keys="true"
         label="Render Metadata"
-        layout="topleft"
         name="Render Metadata"
         tear_off="true">
         <menu_item_check
          label="Bounding Boxes"
-         layout="topleft"
          name="Bounding Boxes">
         <menu_item_check.on_check
          function="Advanced.CheckInfoDisplay"
@@ -2244,7 +1907,6 @@
         </menu_item_check>
         <menu_item_check
          label="Octree"
-         layout="topleft"
          name="Octree">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2255,7 +1917,6 @@
         </menu_item_check>
         <menu_item_check
          label="Shadow Frusta"
-         layout="topleft"
          name="Shadow Frusta">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2266,7 +1927,6 @@
         </menu_item_check>
         <menu_item_check
          label="Occlusion"
-         layout="topleft"
          name="Occlusion">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2277,7 +1937,6 @@
         </menu_item_check>
         <menu_item_check
          label="Render Batches"
-         layout="topleft"
          name="Render Batches">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2288,7 +1947,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Anim"
-         layout="topleft"
          name="Texture Anim">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2299,7 +1957,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Priority"
-         layout="topleft"
          name="Texture Priority">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2310,7 +1967,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Area"
-         layout="topleft"
          name="Texture Area">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2321,7 +1977,6 @@
         </menu_item_check>
         <menu_item_check
          label="Face Area"
-         layout="topleft"
          name="Face Area">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2332,7 +1987,6 @@
         </menu_item_check>
         <menu_item_check
          label="Lights"
-         layout="topleft"
          name="Lights">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2343,7 +1997,6 @@
         </menu_item_check>
         <menu_item_check
          label="Collision Skeleton"
-         layout="topleft"
          name="Collision Skeleton">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2354,7 +2007,6 @@
         </menu_item_check>
         <menu_item_check
          label="Raycast"
-         layout="topleft"
          name="Raycast">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2367,7 +2019,6 @@
         <menu
          create_jump_keys="true"
          label="Rendering"
-         layout="topleft"
          name="Rendering"
          tear_off="true">
             <menu_item_check
@@ -2509,7 +2160,6 @@
             </menu_item_check>
             <menu_item_check
               label="Full Res Textures"
-             layout="topleft"
              name="Rull Res Textures">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2520,7 +2170,6 @@
             </menu_item_check>
             <menu_item_check
                label="Audit Textures"
-               layout="topleft"
                name="Audit Textures">
               <menu_item_check.on_check
                function="CheckControl"
@@ -2574,12 +2223,10 @@
         <menu
          create_jump_keys="true"
          label="Network"
-         layout="topleft"
          name="Network"
          tear_off="true">
             <menu_item_check
              label="Pause Agent"
-             layout="topleft"
              name="AgentPause">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2588,27 +2235,22 @@
                  function="ToggleControl"
                  parameter="AgentPause" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Enable Message Log"
-             layout="topleft"
              name="Enable Message Log">
                 <menu_item_call.on_click
                  function="Advanced.EnableMessageLog" />
             </menu_item_call>
             <menu_item_call
              label="Disable Message Log"
-             layout="topleft"
              name="Disable Message Log">
                 <menu_item_call.on_click
                  function="Advanced.DisableMessageLog" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Velocity Interpolate Objects"
-             layout="topleft"
              name="Velocity Interpolate Objects">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2619,7 +2261,6 @@
             </menu_item_check>
             <menu_item_check
              label="Ping Interpolate Object Positions"
-             layout="topleft"
              name="Ping Interpolate Object Positions">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2628,11 +2269,9 @@
                  function="ToggleControl"
                  parameter="PingInterpolate" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Drop a Packet"
-             layout="topleft"
              name="Drop a Packet"
              shortcut="control|alt|L">
                 <menu_item_call.on_click
@@ -2641,14 +2280,12 @@
         </menu>
         <menu_item_call
          label="Dump Scripted Camera"
-         layout="topleft"
          name="Dump Scripted Camera">
             <menu_item_call.on_click
              function="Advanced.DumpScriptedCamera" />
         </menu_item_call>
         <menu_item_call
              label="Bumps, Pushes &amp; Hits"
-             layout="topleft"
              name="Bumps, Pushes &amp;amp; Hits">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -2658,12 +2295,10 @@
         <menu
          create_jump_keys="true"
          label="Recorder"
-         layout="topleft"
          name="Recorder"
          tear_off="true">
             <menu_item_call
              label="Start Playback"
-             layout="topleft"
              name="Start Playback">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2671,7 +2306,6 @@
             </menu_item_call>
             <menu_item_call
              label="Stop Playback"
-             layout="topleft"
              name="Stop Playback">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2679,7 +2313,6 @@
             </menu_item_call>
             <menu_item_check
              label="Loop Playback"
-             layout="topleft"
              name="Loop Playback">
                 <menu_item_check.on_check
                  function="Advanced.CheckAgentPilotLoop"
@@ -2689,7 +2322,6 @@
             </menu_item_check>
             <menu_item_call
              label="Start Record"
-             layout="topleft"
              name="Start Record">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2697,7 +2329,6 @@
             </menu_item_call>
             <menu_item_call
              label="Stop Record"
-             layout="topleft"
              name="Stop Record">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2708,12 +2339,10 @@
         <menu
          create_jump_keys="true"
          label="World"
-         layout="topleft"
          name="World"
          tear_off="true">
             <menu_item_check
              label="Sim Sun Override"
-             layout="topleft"
              name="Sim Sun Override">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2724,7 +2353,6 @@
             </menu_item_check>
             <menu_item_check
              label="Cheesy Beacon"
-             layout="topleft"
              name="Cheesy Beacon">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2735,7 +2363,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fixed Weather"
-             layout="topleft"
              name="Fixed Weather">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2746,7 +2373,6 @@
             </menu_item_check>
             <menu_item_call
              label="Dump Region Object Cache"
-             layout="topleft"
              name="Dump Region Object Cache">
                 <menu_item_call.on_click
                  function="Advanced.DumpRegionObjectCache" />
@@ -2755,12 +2381,10 @@
         <menu
          create_jump_keys="true"
          label="UI"
-         layout="topleft"
          name="UI"
          tear_off="true">
          <!--   <menu_item_check
              label="New Bottom Bar"
-             layout="topleft"
              name="New Bottom Bar">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2771,7 +2395,6 @@
             </menu_item_check>-->
             <menu_item_call
              label="Web Browser Test"
-             layout="topleft"
              name="Web Browser Test">
                 <menu_item_call.on_click
                  function="Advanced.WebBrowserTest"
@@ -2779,14 +2402,12 @@
             </menu_item_call>
             <menu_item_call
              label="Dump SelectMgr"
-             layout="topleft"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
                  function="Advanced.DumpSelectMgr" />
             </menu_item_call>
             <menu_item_call
              label="Dump Inventory"
-             layout="topleft"
              name="Dump Inventory">
                 <menu_item_call.on_click
                  function="Advanced.DumpInventory" />
@@ -2799,14 +2420,12 @@
             </menu_item_call>
             <menu_item_call
              label="Dump Focus Holder"
-             layout="topleft"
              name="Dump Focus Holder">
                 <menu_item_call.on_click
                  function="Advanced.DumpFocusHolder" />
             </menu_item_call>
             <menu_item_call
              label="Print Selected Object Info"
-             layout="topleft"
              name="Print Selected Object Info"
              shortcut="control|shift|P">
                 <menu_item_call.on_click
@@ -2814,7 +2433,6 @@
             </menu_item_call>
             <menu_item_call
              label="Print Agent Info"
-             layout="topleft"
              name="Print Agent Info"
              shortcut="shift|P">
                 <menu_item_call.on_click
@@ -2822,7 +2440,6 @@
             </menu_item_call>
             <menu_item_call
              label="Memory Stats"
-             layout="topleft"
              name="Memory Stats"
              shortcut="control|alt|shift|M">
                 <menu_item_call.on_click
@@ -2830,7 +2447,6 @@
             </menu_item_call>
             <menu_item_check
              label="Double-ClickAuto-Pilot"
-             layout="topleft"
              name="Double-ClickAuto-Pilot">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2843,7 +2459,6 @@
             <menu_item_separator />
             <menu_item_check
              label="Debug SelectMgr"
-             layout="topleft"
              name="Debug SelectMgr">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2854,7 +2469,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Clicks"
-             layout="topleft"
              name="Debug Clicks">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugClicks"
@@ -2865,7 +2479,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Views"
-             layout="topleft"
              name="Debug Views">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugViews" />
@@ -2874,7 +2487,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Name Tooltips"
-             layout="topleft"
              name="Debug Name Tooltips">
                 <menu_item_check.on_check
                  function="Advanced.CheckXUINameTooltips"
@@ -2884,7 +2496,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Mouse Events"
-             layout="topleft"
              name="Debug Mouse Events">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugMouseEvents"
@@ -2894,7 +2505,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Keys"
-             layout="topleft"
              name="Debug Keys">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugKeys"
@@ -2904,7 +2514,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug WindowProc"
-             layout="topleft"
              name="Debug WindowProc">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugWindowProc"
@@ -2921,14 +2530,12 @@
          tear_off="true">
             <menu_item_call
                label="Reload Color Settings"
-               layout="topleft"
                name="Reload Color Settings">
               <menu_item_call.on_click
                function="Advanced.ReloadColorSettings" />
             </menu_item_call>
             <menu_item_call
              label="Show Font Test"
-             layout="topleft"
              name="Show Font Test">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -2936,21 +2543,18 @@
             </menu_item_call>
             <menu_item_call
              label="Load from XML"
-             layout="topleft"
              name="Load from XML">
                 <menu_item_call.on_click
                  function="Advanced.LoadUIFromXML" />
             </menu_item_call>
             <menu_item_call
              label="Save to XML"
-             layout="topleft"
              name="Save to XML">
                 <menu_item_call.on_click
                  function="Advanced.SaveUIToXML" />
             </menu_item_call>
             <menu_item_check
              label="Show XUI Names"
-             layout="topleft"
              name="Show XUI Names">
                 <menu_item_check.on_check
                  function="Advanced.CheckXUINames"
@@ -2960,7 +2564,6 @@
             </menu_item_check>
           <menu_item_call
            label="Send Test IMs"
-           layout="topleft"
            name="Send Test IMs">
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
@@ -2969,18 +2572,15 @@
         <menu
          create_jump_keys="true"
          label="Avatar"
-         layout="topleft"
          name="Character"
          tear_off="true">
             <menu
              create_jump_keys="true"
              label="Grab Baked Texture"
-             layout="topleft"
              name="Grab Baked Texture"
              tear_off="true">
                 <menu_item_call
                  label="Iris"
-                 layout="topleft"
                  name="Iris">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -2991,7 +2591,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Head"
-                 layout="topleft"
                  name="Head">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3002,7 +2601,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Upper Body"
-                 layout="topleft"
                  name="Upper Body">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3013,7 +2611,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Lower Body"
-                 layout="topleft"
                  name="Lower Body">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3024,7 +2621,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Skirt"
-                 layout="topleft"
                  name="Skirt">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3037,19 +2633,16 @@
             <menu
              create_jump_keys="true"
              label="Character Tests"
-             layout="topleft"
              name="Character Tests"
              tear_off="true">
                 <menu_item_call
                  label="Appearance To XML"
-                 layout="topleft"
                  name="Appearance To XML">
                     <menu_item_call.on_click
                      function="Advanced.AppearanceToXML" />
                 </menu_item_call>
                 <menu_item_call
                  label="Toggle Character Geometry"
-                 layout="topleft"
                  name="Toggle Character Geometry">
                     <menu_item_call.on_click
                      function="Advanced.ToggleCharacterGeometry" />
@@ -3058,28 +2651,24 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Test Male"
-                 layout="topleft"
                  name="Test Male">
                     <menu_item_call.on_click
                      function="Advanced.TestMale" />
                 </menu_item_call>
                 <menu_item_call
                  label="Test Female"
-                 layout="topleft"
                  name="Test Female">
                     <menu_item_call.on_click
                      function="Advanced.TestFemale" />
                 </menu_item_call>
                 <menu_item_call
                  label="Toggle PG"
-                 layout="topleft"
                  name="Toggle PG">
                     <menu_item_call.on_click
                      function="Advanced.TogglePG" />
                 </menu_item_call>
                 <menu_item_check
                  label="Allow Select Avatar"
-                 layout="topleft"
                  name="Allow Select Avatar">
                     <menu_item_check.on_check
                      function="CheckControl"
@@ -3091,14 +2680,12 @@
             </menu>
             <menu_item_call
              label="Force Params to Default"
-             layout="topleft"
              name="Force Params to Default">
                 <menu_item_call.on_click
                  function="Advanced.ForceParamsToDefault" />
             </menu_item_call>
             <menu_item_check
              label="Animation Info"
-             layout="topleft"
              name="Animation Info">
                 <menu_item_check.on_check
                  function="Advanced.CheckAnimationInfo"
@@ -3109,7 +2696,6 @@
             </menu_item_check>
             <menu_item_check
              label="Slow Motion Animations"
-             layout="topleft"
              name="Slow Motion Animations">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -3120,7 +2706,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Look At"
-             layout="topleft"
              name="Show Look At">
                 <menu_item_check.on_check
                  function="Advanced.CheckShowLookAt"
@@ -3130,7 +2715,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Point At"
-             layout="topleft"
              name="Show Point At">
                 <menu_item_check.on_check
                  function="Advanced.CheckShowPointAt"
@@ -3140,7 +2724,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Joint Updates"
-             layout="topleft"
              name="Debug Joint Updates">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugJointUpdates"
@@ -3150,7 +2733,6 @@
             </menu_item_check>
             <menu_item_check
              label="Disable LOD"
-             layout="topleft"
              name="Disable LOD">
                 <menu_item_check.on_check
                  function="Advanced.CheckDisableLOD"
@@ -3160,7 +2742,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Character Vis"
-             layout="topleft"
              name="Debug Character Vis">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugCharacterVis"
@@ -3170,7 +2751,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Collision Skeleton"
-             layout="topleft"
              name="Show Collision Skeleton">
                 <menu_item_check.on_check
                  function="Advanced.CheckInfoDisplay"
@@ -3181,7 +2761,6 @@
             </menu_item_check>
             <menu_item_check
              label="Display Agent Target"
-             layout="topleft"
              name="Display Agent Target">
                 <menu_item_check.on_check
                  function="Advanced.CheckInfoDisplay"
@@ -3193,7 +2772,6 @@
 <!-- Appears not to exist anymore
             <menu_item_check
              label="Debug Rotation"
-             layout="topleft"
              name="Debug Rotation">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -3205,14 +2783,12 @@
 -->
             <menu_item_call
              label="Dump Attachments"
-             layout="topleft"
              name="Dump Attachments">
                 <menu_item_call.on_click
                  function="Advanced.DumpAttachments" />
             </menu_item_call>
             <menu_item_call
              label="Debug Avatar Textures"
-             layout="topleft"
              name="Debug Avatar Textures"
              shortcut="control|alt|shift|A">
                 <menu_item_call.on_click
@@ -3220,18 +2796,15 @@
             </menu_item_call>
             <menu_item_call
              label="Dump Local Textures"
-             layout="topleft"
              name="Dump Local Textures"
              shortcut="alt|shift|M">
                 <menu_item_call.on_click
                  function="Advanced.DumpAvatarLocalTextures" />
             </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="HTTP Textures"
-         layout="topleft"
          name="HTTP Textures">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3242,14 +2815,12 @@
         </menu_item_check>
         <menu_item_call
          label="Compress Images"
-         layout="topleft"
          name="Compress Images">
             <menu_item_call.on_click
              function="Advanced.CompressImage" />
         </menu_item_call>
         <menu_item_check
          label="Output Debug Minidump"
-         layout="topleft"
          name="Output Debug Minidump">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3260,7 +2831,6 @@
         </menu_item_check>
         <menu_item_check
          label="Console Window on next Run"
-         layout="topleft"
          name="Console Window">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3269,11 +2839,9 @@
              function="ToggleControl"
              parameter="ShowConsoleWindow" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="Show Admin Menu"
-         layout="topleft"
          name="View Admin Options">
             <menu_item_check.on_check
              function="Advanced.CheckViewAdminOptions"
@@ -3283,7 +2851,6 @@
         </menu_item_check>
         <menu_item_call
          label="Request Admin Status"
-         layout="topleft"
          name="Request Admin Options"
          shortcut="control|alt|G">
             <menu_item_call.on_click
@@ -3291,7 +2858,6 @@
         </menu_item_call>
         <menu_item_call
          label="Leave Admin Status"
-         layout="topleft"
          name="Leave Admin Options"
          shortcut="control|alt|shift|G">
             <menu_item_call.on_click
@@ -3301,18 +2867,15 @@
     <menu
      create_jump_keys="true"
      label="Admin"
-     layout="topleft"
      name="Admin"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Object"
-         layout="topleft"
          tear_off="true">
             <menu_item_call
              label="Take Copy"
-             layout="topleft"
              name="Take Copy"
              shortcut="control|alt|shift|O">
                 <menu_item_call.on_click
@@ -3322,7 +2885,6 @@
             </menu_item_call>
             <menu_item_call
              label="Force Owner To Me"
-             layout="topleft"
              name="Force Owner To Me">
                 <menu_item_call.on_click
                  function="Admin.HandleObjectOwnerSelf" />
@@ -3331,7 +2893,6 @@
             </menu_item_call>
             <menu_item_call
              label="Force Owner Permissive"
-             layout="topleft"
              name="Force Owner Permissive">
                 <menu_item_call.on_click
                  function="Admin.HandleObjectOwnerPermissive" />
@@ -3340,7 +2901,6 @@
             </menu_item_call>
             <menu_item_call
              label="Delete"
-             layout="topleft"
              name="Delete"
              shortcut="control|alt|shift|Del">
                 <menu_item_call.on_click
@@ -3350,7 +2910,6 @@
             </menu_item_call>
             <menu_item_call
              label="Lock"
-             layout="topleft"
              name="Lock"
              shortcut="control|alt|shift|L">
                 <menu_item_call.on_click
@@ -3360,7 +2919,6 @@
             </menu_item_call>
             <menu_item_call
              label="Get Assets IDs"
-             layout="topleft"
              name="Get Assets IDs"
              shortcut="control|alt|shift|I">
                 <menu_item_call.on_click
@@ -3372,12 +2930,10 @@
         <menu
          create_jump_keys="true"
          label="Parcel"
-         layout="topleft"
          name="Parcel"
          tear_off="true">
             <menu_item_call
              label="Force Owner To Me"
-             layout="topleft"
              name="Owner To Me">
                 <menu_item_call.on_click
                  function="Admin.HandleForceParcelOwnerToMe" />
@@ -3386,7 +2942,6 @@
             </menu_item_call>
             <menu_item_call
              label="Set to Linden Content"
-             layout="topleft"
              name="Set to Linden Content"
              shortcut="control|alt|shift|C">
                 <menu_item_call.on_click
@@ -3396,7 +2951,6 @@
             </menu_item_call>
             <menu_item_call
              label="Claim Public Land"
-             layout="topleft"
              name="Claim Public Land">
                 <menu_item_call.on_click
                  function="Admin.HandleClaimPublicLand" />
@@ -3407,12 +2961,10 @@
         <menu
          create_jump_keys="true"
          label="Region"
-         layout="topleft"
          name="Region"
          tear_off="true">
             <menu_item_call
              label="Dump Temp Asset Data"
-             layout="topleft"
              name="Dump Temp Asset Data">
                 <menu_item_call.on_click
                  function="Admin.HandleRegionDumpTempAssetData" />
@@ -3421,7 +2973,6 @@
             </menu_item_call>
             <menu_item_call
              label="Save Region State"
-             layout="topleft"
              name="Save Region State">
                 <menu_item_call.on_click
                  function="Admin.OnSaveState" />
@@ -3431,7 +2982,6 @@
         </menu>
         <menu_item_call
          label="God Tools"
-         layout="topleft"
          name="God Tools">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -3443,34 +2993,29 @@
     <menu
      create_jump_keys="true"
      label="Admin"
-     layout="topleft"
      name="Deprecated"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Attach Object"
-         layout="topleft"
          mouse_opaque="false"
          name="Attach Object"
          tear_off="true" />
         <menu
          create_jump_keys="true"
          label="Detach Object"
-         layout="topleft"
          mouse_opaque="false"
          name="Detach Object"
          tear_off="true" />
         <menu
          create_jump_keys="true"
          label="Take Off Clothing"
-         layout="topleft"
          mouse_opaque="false"
          name="Take Off Clothing"
          tear_off="true">
             <menu_item_call
              label="Shirt"
-             layout="topleft"
              name="Shirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3481,7 +3026,6 @@
             </menu_item_call>
             <menu_item_call
              label="Pants"
-             layout="topleft"
              name="Pants">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3492,7 +3036,6 @@
             </menu_item_call>
             <menu_item_call
              label="Shoes"
-             layout="topleft"
              name="Shoes">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3503,7 +3046,6 @@
             </menu_item_call>
             <menu_item_call
              label="Socks"
-             layout="topleft"
              name="Socks">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3514,7 +3056,6 @@
             </menu_item_call>
             <menu_item_call
              label="Jacket"
-             layout="topleft"
              name="Jacket">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3525,7 +3066,6 @@
             </menu_item_call>
             <menu_item_call
              label="Gloves"
-             layout="topleft"
              name="Gloves">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3536,7 +3076,6 @@
             </menu_item_call>
             <menu_item_call
              label="Undershirt"
-             layout="topleft"
              name="Menu Undershirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3547,7 +3086,6 @@
             </menu_item_call>
             <menu_item_call
              label="Underpants"
-             layout="topleft"
              name="Menu Underpants">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3558,7 +3096,6 @@
             </menu_item_call>
             <menu_item_call
              label="Skirt"
-             layout="topleft"
              name="Skirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3569,7 +3106,6 @@
             </menu_item_call>
             <menu_item_call
              label="Alpha"
-             layout="topleft"
              name="Alpha">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3580,7 +3116,6 @@
             </menu_item_call>
             <menu_item_call
              label="Tattoo"
-             layout="topleft"
              name="Tattoo">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3591,7 +3126,6 @@
             </menu_item_call>
             <menu_item_call
              label="All Clothes"
-             layout="topleft"
              name="All Clothes">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3601,12 +3135,10 @@
         <menu
          create_jump_keys="true"
          label="Help"
-         layout="topleft"
          name="Help"
          tear_off="true">
             <menu_item_call
              label="Official Linden Blog"
-             layout="topleft"
              name="Official Linden Blog">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -3615,7 +3147,6 @@
             </menu_item_call>
             <menu_item_call
              label="Scripting Portal"
-             layout="topleft"
              name="Scripting Portal">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -3625,12 +3156,10 @@
             <menu
              create_jump_keys="true"
              label="Bug Reporting"
-             layout="topleft"
              name="Bug Reporting"
              tear_off="true">
                 <menu_item_call
                  label="Public Issue Tracker"
-                 layout="topleft"
                  name="Public Issue Tracker">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3639,18 +3168,15 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Public Issue Tracker Help"
-                 layout="topleft"
                  name="Publc Issue Tracker Help">
                     <menu_item_call.on_click
                      function="PromptShowURL"
                      name="PublicIssueTrackerHelp_url"
                      parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
                 </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
+                <menu_item_separator/>
                 <menu_item_call
                  label="Bug Reporting 101"
-                 layout="topleft"
                  name="Bug Reporing 101">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3659,7 +3185,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Security Issues"
-                 layout="topleft"
                  name="Security Issues">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3668,7 +3193,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="QA Wiki"
-                 layout="topleft"
                  name="QA Wiki">
                     <menu_item_call.on_click
                      function="PromptShowURL"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cc68ec2bdc..01adc00e1a 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -64,7 +64,6 @@ First name:
 </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
 height="22"
 label="First"
 left_delta="0"
@@ -85,7 +84,6 @@ top_pad="0"
     Last name:   </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
 height="22"
 label="Last"
 max_length="31"
@@ -106,7 +104,6 @@ top="20"
 </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
   height="22"
   max_length="16"
 name="password_edit"
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 9e5ef10d42..2efcfa5772 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -742,7 +742,6 @@
                          bg_focus_color="DkGray2"
                          bg_readonly_color="DkGray2"
                          follows="left|top|right"
-                         handle_edit_keys_directly="true"
                          height="90"
                          layout="topleft"
                          left="10"
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 2123e62daa..d75aba44e5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -210,7 +210,6 @@
    enabled="false"
    follows="left|top"
    font="SansSerif"
-   handle_edit_keys_directly="true"
    height="23"
    layout="topleft"
    left="80"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index dc8f71c868..2b2ea78fac 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -113,7 +113,6 @@
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
-     handle_edit_keys_directly="true"
      width="340"
      word_wrap="true">
         There is no Covenant provided for this Estate.
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index d444420550..c5c66c04d5 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -143,7 +143,6 @@
      name="Script Editor"
      width="487"
      show_line_numbers="true" 
-     handle_edit_keys_directly="true" 
      word_wrap="true">
         Loading...
     </text_editor>
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 a21e3f2645..a054960bf8 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -3,7 +3,6 @@
              background_image_disabled="TextField_Disabled"
              background_image_focused="TextField_Active"
              select_on_focus="false"
-             handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
              ignore_tab="true"
              cursor_color="TextCursorColor"
-- 
cgit v1.2.3


From 2be2fdca5c334b787b8019d7226a48e1d5eaec91 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 1 Apr 2010 14:08:49 -0700
Subject: EXT-3606 - Script editor window: next line not indenting if current
 line wraps

---
 indra/newview/skins/default/xui/en/floater_test_text_editor.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_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index b730f0e511..548e24efba 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -14,6 +14,7 @@
    name="test_text_editor"
    tool_tip="text editor"
    top="25"
+   word_wrap="true" 
    width="200">
     Text Editor
   </text_editor>
-- 
cgit v1.2.3


From b6109c46451ab097ff4ce9d8d46ca596b0ab0ce0 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 1 Apr 2010 15:10:30 -0700
Subject: EXT-5168 	 prefs review: Remove "Small nametags" option reviewed
 by Richard cc#176

---
 .../default/xui/en/panel_preferences_general.xml      | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

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

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 e667fa9a2b..9eaabbe77b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -177,7 +177,7 @@
      layout="topleft"
      left="30"
      name="start_location_textbox"
-     top_pad="10"
+     top_pad="15"
      width="394">
         Start location:
     </text>
@@ -256,26 +256,15 @@
      left="50"
      name="show_my_name_checkbox1"
      width="300" />
-    <check_box
-	 enabled_control="AvatarNameTagMode"
-     control_name="SmallAvatarNames"
-     height="16"
-     initial_value="true"
-     label="Small name tags"
-     layout="topleft"
-     left_delta="175"
-     name="small_avatar_names_checkbox"
-     width="200" />
    <check_box
 	 enabled_control="AvatarNameTagMode"
      control_name="RenderShowGroupTitleAll"
      height="16"
      label="Show group titles"
      layout="topleft"
-     left_delta="-175"
+     left_delta="175"
      name="show_all_title_checkbox1"
-     top_pad="5"
-     width="300" />
+     width="200" />
     <text
      type="string"
      length="1"
@@ -354,7 +343,7 @@
      left="30"
      mouse_opaque="false"
      name="text_box3"
-     top_pad="10"
+     top_pad="15"
      width="240">
        Busy mode response:
     </text>
-- 
cgit v1.2.3


From 38c1bc9e9a533b6f9b2e1fc8258da482f25aec8b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 1 Apr 2010 15:11:13 -0700
Subject: EXT-5179 In Prefs->Setup, move Other Devices to bottom of window or
 to advanced  EXT-5170 prefs review: move UI size to advanced reviewed by
 Richard CC#176

---
 .../default/xui/en/panel_preferences_advanced.xml  | 43 +++++++++++++++++++++-
 .../default/xui/en/panel_preferences_graphics1.xml | 29 +--------------
 .../default/xui/en/panel_preferences_setup.xml     | 14 +------
 3 files changed, 43 insertions(+), 43 deletions(-)

(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 e604e401f6..69e8e6fdcc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -186,6 +186,32 @@ Automatic position for:
 		     function="Pref.applyUIColor"
 		     parameter="BackgroundChatColor" />
     </color_swatch>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left="30"
+   name="UI Size:"
+   top_pad="5"
+   width="300">
+    UI size
+  </text>
+  <slider
+   control_name="UIScaleFactor"
+   decimal_digits="2"
+   follows="left|top"
+   height="17"
+   increment="0.025"
+   initial_value="1"
+   layout="topleft"
+   left_delta="52"
+   max_val="1.4"
+   min_val="0.75"
+   name="ui_scale_slider"
+   top_pad="-14"
+   width="180" />
     <check_box
      control_name="ShowScriptErrors"
      follows="left|top"
@@ -193,6 +219,7 @@ Automatic position for:
      label="Show script errors in:"
      layout="topleft"
      left="30"
+     top_pad="10" 
      name="show_script_errors"
      width="256" />
     <radio_group
@@ -247,6 +274,7 @@ Automatic position for:
      top_pad="5"
      width="200" />
     <button
+     layout="topleft" 
      follows="top|left"
      enabled_control="EnableVoiceChat"
      height="23"
@@ -257,8 +285,8 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetKey" />
     </button>
-    <button
-     enabled_control="EnableVoiceChat"
+  <button
+   enabled_control="EnableVoiceChat"
      follows="top|left"
      halign="center"
      height="23"
@@ -271,4 +299,15 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
+  <button
+ height="23"
+ label="Other Devices"
+ left="30"
+ name="joystick_setup_button"
+ top_pad="12"
+ width="155">
+    <button.commit_callback
+     function="Floater.Show"
+     parameter="pref_joystick" />
+  </button>
 </panel>
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 c74de043e9..44c44f5f59 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,33 +9,6 @@
  name="Display panel"
  top="1"
  width="517">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
-     name="UI Size:"
-     top="10"
-     width="300">
-        UI size:
-    </text>
-    <slider
-     can_edit_text="true"
-     control_name="UIScaleFactor"
-     decimal_digits="2"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     left_delta="52"
-     max_val="1.4"
-     min_val="0.75"
-     name="ui_scale_slider"
-     top_pad="2"
-     width="180" />
     <text
      type="string"
      length="1"
@@ -44,7 +17,7 @@
      layout="topleft"
      left="30"
      name="QualitySpeed"
-     top_pad="4"
+     top="10" 
      width="400">
         Quality and speed:
     </text>
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 2123e62daa..8d7b40b386 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -9,18 +9,6 @@
  name="Input panel"
  top="1"
  width="517">
-  <button
-   height="23"
-   label="Other Devices"
-   layout="topleft"
-   left="30"
-   name="joystick_setup_button"
-   top="10"
-   width="155">
-    <button.commit_callback
-     function="Floater.Show"
-     parameter="pref_joystick" />
-  </button>
   <text
    type="string"
    length="1"
@@ -29,7 +17,7 @@
    layout="topleft"
    left="30"
    name="Mouselook:"
-   top_pad="10"
+   top="10"
    width="300">
     Mouselook:
   </text>
-- 
cgit v1.2.3


From 8a22ffa622912f21908b35335e5fdb21e0596a14 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 1 Apr 2010 15:12:20 -0700
Subject: EXT-5110 	 Save Outfit dialog is non-standard modal dialog
 (off-center placement, empty titlebar) reviewed by Richard CC#176

---
 .../newview/skins/default/xui/en/notifications.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c39a91281e..f52996724f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2023,6 +2023,28 @@ Would you be my friend?
     </form>
   </notification>
 
+  <notification
+ icon="alertmodal.tga"
+ label="Save Outfit"
+ name="SaveOutfitAs"
+ type="alertmodal">
+    Save what I'm wearing as a new Outfit:
+    <form name="form">
+      <input name="message" type="text">
+        [DESC] (new)
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="Offer"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="RemoveFromFriends"
-- 
cgit v1.2.3


From 959ec0c305914ac71caa12920ca81230d5d9a6c4 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 1 Apr 2010 15:13:03 -0700
Subject: EXT-3792 	 Legacy menus are still displayed in Inventory in
 Inventory side panel reviewed by Richard CC#176

---
 .../skins/default/xui/en/panel_main_inventory.xml  | 369 +--------------------
 1 file changed, 4 insertions(+), 365 deletions(-)

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

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 bef62f48e0..11998a774d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -38,367 +38,6 @@
 		     width="300">
 	        Items:
     </text>
-    <menu_bar
-     bg_visible="false"
-     follows="left|top|right"
-     height="20"
-     layout="topleft"
-     left="10"
-     mouse_opaque="false"
-     name="Inventory Menu"
-     top="+10"
-	 visible="true"
-     width="290">
-        <menu
-         height="101"
-         label="File"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="File"
-         tear_off="true"
-         top="-117"
-         width="128">
-            <menu_item_call
-             label="Open"
-             layout="topleft"
-             name="Open">
-                <menu_item_call.on_click
-                 function="Inventory.DoToSelected"
-                 parameter="open" />
-            </menu_item_call>
-            <menu
-             create_jump_keys="true"
-             label="Upload"
-             layout="topleft"
-             name="upload"
-             tear_off="true">
-                <menu_item_call
-                 label="Image (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Image"
-                 shortcut="control|U">
-                    <menu_item_call.on_click
-                     function="File.UploadImage"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Sound (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Sound">
-                    <menu_item_call.on_click
-                     function="File.UploadSound"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Animation (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Animation">
-                    <menu_item_call.on_click
-                     function="File.UploadAnim"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Bulk (L$[COST] per file)..."
-                 layout="topleft"
-                 name="Bulk Upload">
-                    <menu_item_call.on_click
-                     function="File.UploadBulk"
-                     parameter="" />
-                </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
-            </menu>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="New Window"
-             layout="topleft"
-             name="New Window">
-                <menu_item_call.on_click
-                 function="Inventory.NewWindow" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator2" />
-            <menu_item_call
-             label="Show Filters"
-             layout="topleft"
-             name="Show Filters">
-                <menu_item_call.on_click
-                 function="Inventory.ShowFilters" />
-            </menu_item_call>
-            <menu_item_call
-             label="Reset Filters"
-             layout="topleft"
-             name="Reset Current">
-                <menu_item_call.on_click
-                 function="Inventory.ResetFilters" />
-            </menu_item_call>
-            <menu_item_call
-             label="Close All Folders"
-             layout="topleft"
-             name="Close All Folders">
-                <menu_item_call.on_click
-                 function="Inventory.CloseAllFolders" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator3" />
-            <menu_item_call
-             label="Empty Trash"
-             layout="topleft"
-             name="Empty Trash">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyTrash" />
-            </menu_item_call>
-            <menu_item_call
-             label="Empty Lost And Found"
-             layout="topleft"
-             name="Empty Lost And Found">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyLostAndFound" />
-            </menu_item_call>
-        </menu>
-        <menu
-         height="121"
-         label="Create"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Create"
-         tear_off="true"
-         top="-201"
-         width="121">
-            <menu_item_call
-             label="New Folder"
-             layout="topleft"
-             name="New Folder">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="category" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Script"
-             layout="topleft"
-             name="New Script">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="lsl" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Notecard"
-             layout="topleft"
-             name="New Note">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="notecard" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Gesture"
-             layout="topleft"
-             name="New Gesture">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="gesture" />
-            </menu_item_call>
-            <menu
-             height="175"
-             label="New Clothes"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Clothes"
-             top_pad="514"
-             width="125">
-                <menu_item_call
-                 label="New Shirt"
-                 layout="topleft"
-                 name="New Shirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Pants"
-                 layout="topleft"
-                 name="New Pants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="pants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Shoes"
-                 layout="topleft"
-                 name="New Shoes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shoes" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Socks"
-                 layout="topleft"
-                 name="New Socks">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="socks" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Jacket"
-                 layout="topleft"
-                 name="New Jacket">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="jacket" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skirt"
-                 layout="topleft"
-                 name="New Skirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Gloves"
-                 layout="topleft"
-                 name="New Gloves">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="gloves" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Undershirt"
-                 layout="topleft"
-                 name="New Undershirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="undershirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Underpants"
-                 layout="topleft"
-                 name="New Underpants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="underpants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Alpha"
-                 layout="topleft"
-                 name="New Alpha">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="alpha" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Tattoo"
-                 layout="topleft"
-                 name="New Tattoo">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="tattoo" />
-                </menu_item_call>
-            </menu>
-            <menu
-             height="85"
-             label="New Body Parts"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Body Parts"
-             top_pad="514"
-             width="118">
-                <menu_item_call
-                 label="New Shape"
-                 layout="topleft"
-                 name="New Shape">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shape" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skin"
-                 layout="topleft"
-                 name="New Skin">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skin" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Hair"
-                 layout="topleft"
-                 name="New Hair">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="hair" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Eyes"
-                 layout="topleft"
-                 name="New Eyes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="eyes" />
-                </menu_item_call>
-            </menu>
-        </menu>
-        <menu
-         height="49"
-         label="Sort"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Sort"
-         tear_off="true"
-         top="-113"
-         width="118">
-            <menu_item_check
-             control_name="Inventory.SortByName"
-             label="By Name"
-             layout="topleft"
-             name="By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="name" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SortByDate"
-             label="By Date"
-             layout="topleft"
-             name="By Date">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="date" />
-            </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_check
-             control_name="Inventory.FoldersAlwaysByName"
-             label="Folders Always By Name"
-             layout="topleft"
-             name="Folders Always By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="foldersalwaysbyname" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SystemFoldersToTop"
-             label="System Folders To Top"
-             layout="topleft"
-             name="System Folders To Top">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="systemfolderstotop" />
-            </menu_item_check>
-        </menu>
-    </menu_bar>
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
@@ -408,7 +47,7 @@
      left="10"
      max_length="300"
      name="inventory search editor"
-     top="+31"
+     top="3"
      width="303" />
     <tab_container
        bg_opaque_color="DkGray2"
@@ -417,7 +56,7 @@
        background_opaque="true"
        follows="all"
        halign="center"
-       height="306"
+       height="334"
        layout="topleft"
        left="7"
        name="inventory filter tabs"
@@ -434,7 +73,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="295"
+         height="322"
          label="MY INVENTORY"
          help_topic="my_inventory_tab"
          layout="topleft"
@@ -451,7 +90,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="293"
+         height="320"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
-- 
cgit v1.2.3


From ca8da832bdb1532c47208ea5e1b6ef50a40c3677 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 1 Apr 2010 15:35:55 -0700
Subject: fixed line endings

---
 .../skins/default/xui/en/panel_main_inventory.xml  | 318 ++++++++++-----------
 1 file changed, 159 insertions(+), 159 deletions(-)

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

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 b1c2173686..1b04d01abf 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,159 +1,159 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="408"
- label="Things"
- layout="topleft"
- min_height="350"
- min_width="240"
- name="main inventory panel"
- width="330">
-  <panel.string
-   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>
-  <filter_editor
-   text_pad_left="10"
-   follows="left|top|right"
- height="23"
-   label="Filter Inventory"
-   layout="topleft"
-   left="10"
-   max_length="300"
-   name="inventory search editor"
-   top="3"
-   width="303" />
-  <tab_container
-     bg_alpha_color="DkGray"
-     bg_opaque_color="DkGray"
-     background_visible="true"
-     background_opaque="true"
-     follows="all"
-     halign="center"
-     height="339"
-     layout="topleft"
-     left="7"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="10"
-     width="312">
-    <inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="MY INVENTORY"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-     top="16"
-     width="288" />
-    <inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="RECENT"
-     help_topic="recent_inventory_tab"
-     layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-     width="290" />
-  </tab_container>
-
-  <panel
-     background_visible="true"
-   bevel_style="none"
-   follows="left|right|bottom"
-   height="27"
-   layout="topleft"
-   top_pad="-1"
-   left="10"
-   name="bottom_panel"
-   width="310">
-    <button
-     follows="bottom|left"
-     tool_tip="Show additional options"
-     height="25"
-     image_hover_unselected="Toolbar_Left_Over"
-     image_overlay="OptionsMenu_Off"
-     image_selected="Toolbar_Left_Selected"
-     image_unselected="Toolbar_Left_Off"
-     layout="topleft"
-     left="0"
-     name="options_gear_btn"
-     top="1"
-     width="31" />
-    <button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_overlay="AddItem_Off"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="add_btn"
-     tool_tip="Add new item"
-     width="31" />
-    <icon
-     follows="bottom|left"
-     height="25"
-     image_name="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="dummy_icon"
-     width="209"
-       />
-    <dnd_button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Right_Over"
-     image_overlay="TrashItem_Off"
-     image_selected="Toolbar_Right_Selected"
-     image_unselected="Toolbar_Right_Off"
-     left_pad="1"
-     layout="topleft"
-     name="trash_btn"
-     tool_tip="Remove selected item"
-     width="31"/>
-  </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="all"
+ height="408"
+ label="Things"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ name="main inventory panel"
+ width="330">
+  <panel.string
+   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>
+  <filter_editor
+   text_pad_left="10"
+   follows="left|top|right"
+ height="23"
+   label="Filter Inventory"
+   layout="topleft"
+   left="10"
+   max_length="300"
+   name="inventory search editor"
+   top="3"
+   width="303" />
+  <tab_container
+     bg_alpha_color="DkGray"
+     bg_opaque_color="DkGray"
+     background_visible="true"
+     background_opaque="true"
+     follows="all"
+     halign="center"
+     height="339"
+     layout="topleft"
+     left="7"
+     name="inventory filter tabs"
+     tab_height="30"
+     tab_position="top"
+     tab_min_width="100"
+     top_pad="10"
+     width="312">
+    <inventory_panel
+        bg_opaque_color="DkGray2"
+   bg_alpha_color="DkGray2"
+   background_visible="true"
+   background_opaque="true"
+     border="false"
+     bevel_style="none"
+     follows="all"
+     height="338"
+     label="MY INVENTORY"
+     help_topic="my_inventory_tab"
+     layout="topleft"
+     left="0"
+     name="All Items"
+     sort_order_setting="InventorySortOrder"
+     top="16"
+     width="288" />
+    <inventory_panel
+        bg_opaque_color="DkGray2"
+   bg_alpha_color="DkGray2"
+   background_visible="true"
+   background_opaque="true"
+     border="false"
+     bevel_style="none"
+     follows="all"
+     height="338"
+     label="RECENT"
+     help_topic="recent_inventory_tab"
+     layout="topleft"
+     left_delta="0"
+     name="Recent Items"
+     width="290" />
+  </tab_container>
+
+  <panel
+     background_visible="true"
+   bevel_style="none"
+   follows="left|right|bottom"
+   height="27"
+   layout="topleft"
+   top_pad="-1"
+   left="10"
+   name="bottom_panel"
+   width="310">
+    <button
+     follows="bottom|left"
+     tool_tip="Show additional options"
+     height="25"
+     image_hover_unselected="Toolbar_Left_Over"
+     image_overlay="OptionsMenu_Off"
+     image_selected="Toolbar_Left_Selected"
+     image_unselected="Toolbar_Left_Off"
+     layout="topleft"
+     left="0"
+     name="options_gear_btn"
+     top="1"
+     width="31" />
+    <button
+     follows="bottom|left"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="AddItem_Off"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="1"
+     name="add_btn"
+     tool_tip="Add new item"
+     width="31" />
+    <icon
+     follows="bottom|left"
+     height="25"
+     image_name="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="1"
+     name="dummy_icon"
+     width="209"
+       />
+    <dnd_button
+     follows="bottom|left"
+     height="25"
+     image_hover_unselected="Toolbar_Right_Over"
+     image_overlay="TrashItem_Off"
+     image_selected="Toolbar_Right_Selected"
+     image_unselected="Toolbar_Right_Off"
+     left_pad="1"
+     layout="topleft"
+     name="trash_btn"
+     tool_tip="Remove selected item"
+     width="31"/>
+  </panel>
+</panel>
-- 
cgit v1.2.3


From 43d756a7dcd60215204f8f02c9bd6ba26b5b4ca0 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 2 Apr 2010 13:58:16 +0300
Subject: done EXT-6674 Switch Edit Outfit panel (list at the top) to show
 content of the Current Outfit system folder

reviewed at https://codereview.productengine.com/secondlife/r/159/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml       | 5 ++++-
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 4d3ee07195..c1800384a3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -12,6 +12,9 @@
  name="outfit_edit"
  top="0"
  width="320">
+    <string
+     name="No Outfit"
+     value="No Outfit"/>
 	
 	<panel.string
 		name="not_available">
@@ -94,7 +97,7 @@
                  font="SansSerifHugeBold"
                  height="26"
                  layout="topleft"
-                 name="curr_look_name"
+                 name="curr_outfit_name"
                  text_color="LtGray"
                  top_pad="0"
                  value="[Current Outfit]"
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 f9ad525642..66ed43efec 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -122,7 +122,7 @@
 		label="Edit Outfit" 
 		layout="topleft"
         right="-140"
-		name="look_edit_btn"
+		name="edit_current_outfit_btn"
         top="26"
         visible="false" 
 		width="50" />
-- 
cgit v1.2.3


From f6b48339d9423399ccd1c93709de978ccc7f5a8c Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 2 Apr 2010 15:49:13 +0300
Subject: Fixed major bug EXT-6595 (World->Place Profile flyout menu doesn't
 include link to side panel place info).

Added a new main menu item: World -> Place Profile -> Place Profile.
I'm not sure about its label though (double "Place Profile").

Reviewed by Sam: https://codereview.productengine.com/secondlife/r/161/

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

(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 ac31636ed2..551e49daf5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -251,6 +251,13 @@
            layout="topleft"
            name="Land"
            tear_off="true">
+        <menu_item_call
+         label="Place Profile"
+         layout="topleft"
+         name="Place Profile">
+            <menu_item_call.on_click
+             function="World.PlaceProfile" />
+        </menu_item_call>
         <menu_item_call
          label="About Land"
          layout="topleft"
-- 
cgit v1.2.3


From 3e1d33135dd559bebbf362b91c3c966a364685c0 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 2 Apr 2010 12:40:44 -0700
Subject: VWR-17709 en_xui_change to accommodate the longest translation in PL
 even though this is a bug reported for ES; undo JA old override

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index ac0fca9cce..21c0bfef48 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -456,7 +456,7 @@
      layout="topleft"
      left_delta="0"
      name="dscr_title"
-     top_pad="5"
+     top_pad="6"
      width="50">
         Details:
     </text>
@@ -464,11 +464,12 @@
      type="string"
      length="1"
      follows="left|top"
-     height="16"
+     height="22"
      layout="topleft"
      name="bug_aviso"
      left_pad="10"
-     width="200">
+     word_wrap="true"
+     width="270">
         Please be as specific as possible
     </text>
     <text_editor
-- 
cgit v1.2.3


From 50b97bfaf5b975d0e6ea6920b161007ade0d4fc5 Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Fri, 2 Apr 2010 13:30:14 -0700
Subject: Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is
 questionable)

* remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer.
* replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive
* don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in)

Reviewed by Richard at http://codereview.lindenlab.com/1218007
---
 indra/newview/skins/default/xui/en/floater_tos.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(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 f3665e87ed..cbfaac958b 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -11,6 +11,10 @@
      name="real_url">
         http://secondlife.com/app/tos/
     </floater.string>
+    <floater.string
+     name="loading_url">
+        data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
+    </floater.string>
     <button
      enabled="false"
      height="20"
@@ -59,7 +63,6 @@
      layout="topleft"
      left_delta="0"
      name="tos_html"
-     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
      top_delta="40"
      width="568" />
 </floater>
-- 
cgit v1.2.3


From 6b3ca581e037d52e507a69d82fd6d900bd4641b7 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 2 Apr 2010 15:45:58 -0700
Subject: EXT-5921 Inspector icon in nearby chat/IM doesn't match other
 inspector icons

---
 indra/newview/skins/default/xui/en/inspector_info_ctrl.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/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
index 39fb54d513..a7ecc39ed8 100644
--- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
@@ -1,8 +1,8 @@
 <button
  chrome="true"
- image_selected="Info_Small"
- image_unselected="Info_Small"
- image_pressed="Info_Small"
+ image_selected="Info_Over"
+ image_unselected="Info_Over"
+ image_pressed="Info_Over"
  height="12"
  name="inspector_info_ctrl"
  width="12" />
-- 
cgit v1.2.3


From 10c97a9481142a417ea4009ea30bb51b5ba1fdf0 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 6 Apr 2010 12:27:42 +0300
Subject: Fixed normal bug EXT-6545 - Admin > God Tools > Object > Sim Name
 incorrectly reported. Using region name retrieval code. Fixed labels.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_god_tools.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/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 240871ec25..dfe3cf4485 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -61,10 +61,10 @@
              height="10"
              layout="topleft"
              left="10"
-             name="Sim Name:"
+             name="Region Name:"
              top="12"
              width="80">
-                Sim Name:
+                Region Name:
             </text>
             <line_editor
              border_style="line"
@@ -481,10 +481,10 @@
              height="10"
              layout="topleft"
              left="10"
-             name="Sim Name:"
+             name="Region Name:"
              top="10"
              width="80">
-                Sim Name:
+                Region Name:
             </text>
             <text
              type="string"
-- 
cgit v1.2.3


From 67c534d82968fd86ed84605b8a6186e27a214c9e Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 6 Apr 2010 20:28:29 +0300
Subject: Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in
 Taskbar \"Kaufen L$\" should be \"L$ kaufen\")

- Removed the L$ graphic and made \"L$\" part of the label string.

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

--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 8c7de22cf8..c2624ce0d0 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -62,11 +62,11 @@
      halign="right"
      font="SansSerifSmall"
      follows="right|top"
-     image_selected="BuyArrow_Over"
-     image_unselected="BuyArrow_Over"
-     image_pressed="BuyArrow_Press"
+     image_selected="spacer35.tga"
+     image_unselected="spacer35.tga"
+     image_pressed="spacer35.tga"
      height="16"
-     label="Buy"
+     label="Buy L$"
      label_color="EmphasisColor"
      left_pad="0"
      label_shadow="false"
-- 
cgit v1.2.3


From 0758eab5e62897297d6d16feea37df2c84c3aa1a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 16 Apr 2010 14:41:26 -0700
Subject: Backed out changeset: 61a83065d146

---
 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 8c7de22cf8..84664eedcc 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="20"
+     left_pad="15"
      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="10"
+     left_pad="5"
      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 5a5380a65e05db01ef0fa416d098d600f3da41fc Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 6 Apr 2010 20:28:29 +0300
Subject: Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in
 Taskbar \"Kaufen L$\" should be \"L$ kaufen\")

- Removed the L$ graphic and made \"L$\" part of the label string.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/172/
(transplanted from 4cbdcfc8b196f0ff28df1d0897023ee967cce2a3)
---
 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..690d2971ee 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -62,11 +62,11 @@
      halign="right"
      font="SansSerifSmall"
      follows="right|top"
-     image_selected="BuyArrow_Over"
-     image_unselected="BuyArrow_Over"
-     image_pressed="BuyArrow_Press"
+     image_selected="spacer35.tga"
+     image_unselected="spacer35.tga"
+     image_pressed="spacer35.tga"
      height="16"
-     label="Buy"
+     label="Buy L$"
      label_color="EmphasisColor"
      left_pad="0"
      label_shadow="false"
-- 
cgit v1.2.3


From 3585792e73fcccb391329bb19cf00c049adc15f6 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 6 Apr 2010 20:42:00 +0300
Subject: Fixed major bug EXT-6718 (Top menu: 'Build' and 'Help' items are
 absent).

Restoring comment end marker, accidentally removed in changeset 73f60e5518af.

Trivial change, not reviewed.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_viewer.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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8a062f867a..a5e3527833 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -376,7 +376,7 @@
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
         </menu_item_check>
-        <menu_item_separator/>
+        <menu_item_separator/>-->
         <menu_item_separator/>
     <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From 37c1a92da4ee981a6cbd98e682985cdf91f9e9a6 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 6 Apr 2010 19:18:16 +0100
Subject: Resurrect 'Sun' menu options. These seem to have been clobbered by
 some bad XML merging that probably came in with 73f60e5518af / EXT-3531

---
 indra/newview/skins/default/xui/en/menu_viewer.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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8b4554502a..66ae55aab7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -369,7 +369,7 @@
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
         </menu_item_check>
-        <menu_item_separator/>
+        <menu_item_separator/>-->
         <menu_item_separator/>
     <menu
          create_jump_keys="true"
@@ -815,7 +815,7 @@
              function="ShowHelp"
              parameter="f1_help" />
         </menu_item_call>
-        <menu_item_call
+<!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
             <menu_item_call.on_click
-- 
cgit v1.2.3


From 05a4e9dd8bb13caadd25ef3e71aab43e9b857cd1 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 7 Apr 2010 10:45:39 +0300
Subject: (work in progress) EXT-6564(major) - Fix wearable editing panels.
 Updated layout of all Edit Wearable panels. Disabled editing of no-modify
 wearable. Disabled "Save As" for no-copy wearable.

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_alpha.xml      | 53 ++++++++++---------
 .../skins/default/xui/en/panel_edit_eyes.xml       | 55 +++++++++++++------
 .../skins/default/xui/en/panel_edit_gloves.xml     | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_hair.xml       | 55 ++++++++++++++-----
 .../skins/default/xui/en/panel_edit_jacket.xml     | 61 +++++++++++++++-------
 .../skins/default/xui/en/panel_edit_pants.xml      | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_shape.xml      |  4 +-
 .../skins/default/xui/en/panel_edit_shirt.xml      | 47 ++++++++++++-----
 .../skins/default/xui/en/panel_edit_shoes.xml      | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_skin.xml       | 57 +++++++++++++++-----
 .../skins/default/xui/en/panel_edit_skirt.xml      | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_socks.xml      | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_tattoo.xml     | 37 +++++++------
 .../skins/default/xui/en/panel_edit_underpants.xml | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_undershirt.xml | 51 +++++++++++++-----
 .../skins/default/xui/en/panel_edit_wearable.xml   |  4 +-
 16 files changed, 514 insertions(+), 216 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 40647e1b81..1d0c0a02b0 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -1,33 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_alpha_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
    <panel
-      border="true"
-      follows="left|top|right" 
-      height="180" 
+      border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+      follows="top|left|right"
+      height="400" 
       left="10" 
       layout="topleft" 
       name="avatar_alpha_color_panel"
       top="0"
-      width="293" >
+      width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Lower Alpha"
         layout="topleft"
-        left="10"
+        left="30"
         name="Lower Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="94" />
        <check_box
         control_name="LowerAlphaTextureInvisible"
         follows="left"
@@ -41,14 +46,14 @@
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Upper Alpha"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Upper Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="94" />
        <check_box
         control_name="UpperAlphaTextureInvisible"
         follows="left"
@@ -62,14 +67,14 @@
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Head Alpha"
         layout="topleft"
-        left_pad="10"
+        left="30"
         name="Head Alpha"
         tool_tip="Click to choose a picture"
-        top="10"
-        width="64" />
+        top="120"
+        width="94" />
        <check_box
         control_name="HeadAlphaTextureInvisible"
         follows="left"
@@ -83,14 +88,14 @@
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Eye Alpha"
         layout="topleft"
-        left="10"
+        left_pad="20"
         name="Eye Alpha"
         tool_tip="Click to choose a picture"
-        top="100"
-        width="64" />
+        top="120"
+        width="94" />
        <check_box
         control_name="Eye AlphaTextureInvisible"
         follows="left"
@@ -104,14 +109,14 @@
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Hair Alpha"
         layout="topleft"
-        left_pad="10"
+        left="30"
         name="Hair Alpha"
         tool_tip="Click to choose a picture"
-        top_delta="-4"
-        width="64" />
+        top="230"
+        width="94" />
        <check_box
         control_name="HairAlphaTextureInvisible"
         follows="left"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
index c514054c41..f11ef43c76 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_eyes_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_eye_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -23,31 +28,49 @@
              height="80"
              label="Iris"
              layout="topleft"
-             left="8"
+             left="10"
              name="Iris"
              tool_tip="Click to choose a picture"
-             top_pad="10"
+             top="10"
              width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
-		<accordion_tab
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
+        <accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="eyes_main_tab"
 			title="Eyes">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="eyes_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
index 7aca40e8d9..7d8eed5085 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_gloves_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_gloves_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="gloves_main_tab"
 			title="Gloves">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="gloves_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
index e7d1c05301..cd81aa2c4f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_hair_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_hair_color_panel"
 	  top="0"
-	  width="293" > 
+	  width="313" > 
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -23,26 +28,43 @@
              height="80"
              label="Texture"
              layout="topleft"
-             left="8"
+             left="10"
              name="Texture"
              tool_tip="Click to choose a picture"
              top="10"
              width="64" />
 	 </panel>
+   <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
    <accordion 
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="hair_color_tab"
 			title="Color">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="hair_color_param_list"
 				top="0"
@@ -50,11 +72,13 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="hair_style_tab"
 			title="Style">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="hair_style_param_list"
 				top="0"
@@ -62,11 +86,13 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="hair_eyebrows_tab"
 			title="Eyebrows">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="hair_eyebrows_param_list"
 				top="0"
@@ -74,16 +100,19 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="hair_facial_tab"
 			title="Facial">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="hair_facial_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index ed92b1e0f8..ba03865937 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_jacket_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_jacket_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -23,11 +28,11 @@
         height="80"
         label="Upper Fabric"
         layout="topleft"
-        left="10"
+        left="25"
         name="Upper Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="74" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -35,42 +40,60 @@
         height="80"
         label="Lower Fabric"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Lower Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="74" />
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="74" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="jacket_main_tab"
 			title="Jacket">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="jacket_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
index b764188e04..5b02d1f968 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_pants_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_pants_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+   <accordion 
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="pants_main_tab"
 			title="Pants">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="pants_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index 9a3b5c26ec..e1c574001a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -4,7 +4,7 @@
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_shape_panel"
 	 top_pad="10"
 	 width="333" >
@@ -14,7 +14,7 @@
          bg_opaque_color="DkGray2"
          background_visible="true"
          background_opaque="true"
-		 follows="top|left"
+		 follows="top|left|right"
 		 height="50"
 		 left="10"
 		 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
index 4b7235545f..7da8de4c0b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_shirt_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_shirt_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
 	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
+		follows="all"
+		height ="300"
+        layout="topleft"
+		left="0"
 		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+        single_expansion="true"
+		top="0"
+		width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="shirt_main_tab"
 			title="Shirt">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="shirt_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
index e886afa010..84fe26f7f6 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_shoes_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
    <panel
-      border="true"
-      follows="left|top|right" 
-      height="100" 
+      border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+      follows="top|left|right"
+      height="90" 
       left="10" 
       layout="topleft" 
       name="avatar_shoes_color_panel"
       top="0"
-      width="293" >
+      width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+   <accordion 
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="shoes_main_tab"
 			title="Shoes">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="shoes_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
index 918606b54c..b5c8c95473 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_skin_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_skin_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         allow_no_texture="true"
         can_apply_immediately="true"
@@ -24,7 +29,7 @@
         height="80"
         label="Head Tattoos"
         layout="topleft"
-        left="10"
+        left="25"
         name="Head Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
@@ -37,7 +42,7 @@
         height="80"
         label="Upper Tattoos"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Upper Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
@@ -50,26 +55,43 @@
         height="80"
         label="Lower Tattoos"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Lower Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
         width="74" />
 	 </panel>
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">    
 	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
+        layout="topleft"
+		follows="all"
+		height ="300"
+		left="0"
 		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+		top="0"
+        single_expansion="true"
+		width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="skin_color_tab"
 			title="Skin Color">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="skin_color_param_list"
 				top="0"
@@ -77,11 +99,13 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="skin_face_tab"
 			title="Face Detail">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="skin_face_param_list"
 				top="0"
@@ -89,11 +113,13 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="skin_makeup_tab"
 			title="Makeup">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="skin_makeup_param_list"
 				top="0"
@@ -101,16 +127,19 @@
 		</accordion_tab>
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="skin_body_tab"
 			title="Body Detail">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="skin_body_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
index 6cccab1843..16f6950bd5 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_skirt_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
    <panel
-      border="true"
-      follows="left|top|right" 
-      height="100" 
+      border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+      follows="top|left|right"
+      height="90" 
       left="10" 
       layout="topleft" 
       name="avatar_skirt_color_panel"
       top="0"
-      width="293" >
+      width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="skirt_main_tab"
 			title="Skirt">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="skirt_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
index fc7de00714..e4f916703b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_socks_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_socks_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
         width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="socks_main_tab"
 			title="Socks">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="socks_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index b214cd3de0..ed990eb095 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -1,57 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_tattoo_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="400" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_tattoo_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Head Tattoo"
         layout="topleft"
-        left="10"
+        left="30"
         name="Head Tattoo"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="94" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Upper Tattoo"
         layout="topleft"
-        left_pad="10"
+        left_pad="30"
         name="Upper Tattoo"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="94" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="80"
+        height="100"
         label="Lower Tattoo"
         layout="topleft"
-        left_pad="10"
+        left="30"
         name="Lower Tattoo"
         tool_tip="Click to choose a picture"
-        top="10"
-        width="64" />
+        top_pad="10"
+        width="94" />
 	 </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
index 03e0bb70ef..d43497c943 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_underpants_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
    <panel
-      border="true"
-      follows="left|top|right" 
-      height="100" 
+      border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+      follows="top|left|right"
+      height="90" 
       left="10" 
       layout="topleft" 
       name="avatar_underpants_color_panel"
       top="0"
-      width="293" >
+      width="313" >
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -34,31 +39,49 @@
              height="80"
              label="Color/Tint"
              layout="topleft"
-             left_pad="10"
+             left_pad="20"
              name="Color/Tint"
              tool_tip="Click to open color picker"
              top="10"
              width="64" />
 	 </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="underpants_main_tab"
 			title="Underpants">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="underpants_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
index 20c56142fb..45c6ef4526 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
  <panel
+     background_visible="true"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
-	 left="10"
+	 left="0"
 	 name="edit_undershirt_panel"
 	 top_pad="10"
-	 width="313" >
+	 width="333" >
 	 <panel
-	  border="true"
-	  follows="left|top|right" 
-	  height="100" 
+	  border="false"
+      bg_alpha_color="DkGray2"
+      bg_opaque_color="DkGray2"
+      background_visible="true"
+      background_opaque="true"
+	  follows="top|left|right"
+	  height="90" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_undershirt_color_panel"
 	  top="0"
-	  width="293" >
+	  width="313" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -34,31 +39,49 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        left_pad="10"
+        left_pad="20"
         name="Color/Tint"
         tool_tip="Click to open Color Picker"
         top="10"
         width="64" />
        </panel>
-	 <accordion
-		follows="left|top|right|bottom"
-		height ="340"
-		left="10"
-		name="wearable_accordion"
-		top_pad="10"
-		width="303">
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
 		<accordion_tab
 			layout="topleft"
+            fit_panel="false"
 			min_height="150"
 			name="undershirt_main_tab"
 			title="Undershirt">
 			<scrolling_panel_list
 				follows="all"
+                layout="topleft"
 				left="0"
 				name="undershirt_main_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
 	</accordion>
+    </panel>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index b4272bb10a..dc2f085356 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -155,7 +155,7 @@ left="0"
          bg_opaque_color="DkGray2"
          background_visible="true"
          background_opaque="true"
-         follows="top|left"
+         follows="top|left|right"
          height="60"
          label="Shirt"
          layout="topleft"
@@ -164,7 +164,7 @@ left="0"
 		 top_pad="10"
          width="313">
 		 <text
-		 follows="top|left"
+		 follows="top|left|right"
 		 height="16"
 		 layout="topleft"
 		 left="10"
-- 
cgit v1.2.3


From bb3abe5c17c92fec08da5490c3d66b411d25eacd Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 7 Apr 2010 10:49:12 +0300
Subject: fixed EXT-5842 There is a lot of unused space in the online/offline
 toasts, - decreased on/offline notification toasts width from 305 to 220px; -
 added toast right alignment; - made toasts for long avatar names taller
 (according to max length of avatar full name(63 characters) made 3 max line
 of message text in online/offline toasts, also corrected initial geometry
 parameters of panel_online_status_toast.xml to allow method
 LLToastPanel::snapToMessageHeigh works correctly);

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/182/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_online_status_toast.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_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index 14cb5fffee..b1a7697e83 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="false"
- height="152"
+ height="40"
  label="friend_online_status"
  layout="topleft"
  left="0"
  name="friend_online_status"
  top="0"
- width="305">
+ width="220">
     <avatar_icon
 	 follows="top|left"
 	 height="18"
@@ -21,7 +21,7 @@
     <text
      font="SansSerifSmall"
      follows="all"
-     height="137"
+     height="13"
      layout="topleft"
      left_pad="5"
      name="message"
@@ -29,7 +29,7 @@
      top="15"
      use_ellipses="true"
      value=""
-     width="285"
+     width="189"
      word_wrap="true"
      max_length="350" />
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From d4deaf6c9b631c5d59765967f6f715d2ed6eaf28 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 7 Apr 2010 10:54:23 +0300
Subject: Done normal task EXT-6583 ([TRUNCATION] build > select build tool >
 create tool > texture tab) * Increased spinners' "width" & "label_width"
 attribute values. Updated checkboxes & "Apply" button placement to be
 accommodated in tab.     The longest label is in 'DE' locale. * Also removed
 overrides of these widgets in 'fr' & 'it' locales

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

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/floater_tools.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_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 4c67698943..cc9e72cfb5 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2540,18 +2540,18 @@ even though the user gets a free copy.
              height="19"
              initial_value="0"
              label="Horizontal (U)"
-             label_width="90"
+             label_width="125"
              layout="topleft"
              left="20"
              max_val="100"
              name="TexScaleU"
              top_pad="6"
-             width="160" />
+             width="185" />
             <check_box
              height="19"
              label="Flip"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="checkbox flip s"
              top_delta="0"
              width="70" />
@@ -2560,17 +2560,17 @@ even though the user gets a free copy.
              height="19"
              initial_value="0"
              label="Vertical (V)"
-             label_width="90"
+             label_width="125"
              layout="topleft"
              left="20"
              max_val="100"
              name="TexScaleV"
-             width="160" />
+             width="185" />
             <check_box
              height="19"
              label="Flip"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="checkbox flip t"
              top_delta="0"
              width="70" />
@@ -2582,12 +2582,12 @@ even though the user gets a free copy.
              initial_value="0"
 			 label="Rotation˚"
              layout="topleft"
-			 label_width="100"
+			 label_width="135"
              left="10"
              max_val="9999"
              min_val="-9999"
              name="TexRot"
-             width="170" />
+             width="195" />
 
             <spinner
              decimal_digits="1"
@@ -2596,19 +2596,19 @@ even though the user gets a free copy.
              initial_value="1"
 			 label="Repeats / Meter"
              layout="topleft"
-			 label_width="100"
+			 label_width="135"
              left="10"
              max_val="10"
              min_val="0.1"
              name="rptctrl"
-             width="170" />
+             width="195" />
             <button
              follows="left|top"
              height="23"
              label="Apply"
              label_selected="Apply"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="button apply"
              width="75" />
             <text
@@ -2627,24 +2627,24 @@ even though the user gets a free copy.
              height="19"
              initial_value="0"
              label="Horizontal (U)"
-             label_width="90"
+             label_width="125"
              layout="topleft"
              left="20"
              min_val="-1"
              name="TexOffsetU"
-             width="160" />
+             width="185" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0"
              label="Vertical (V)"
-             label_width="90"
+             label_width="125"
              layout="topleft"
              left_delta="0"
              min_val="-1"
              name="TexOffsetV"
              top_pad="1"
-             width="160" />
+             width="185" />
         <panel
          border="false"
          follows="left|top"
-- 
cgit v1.2.3


From 0bb3f144c0a6712a269246975635962b3b5f48d0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 7 Apr 2010 10:37:07 +0100
Subject: Backed out changeset 63b699f90efd

---
 .../newview/skins/default/xui/en/floater_about.xml |  2 +-
 .../newview/skins/default/xui/en/notifications.xml | 63 ----------------
 indra/newview/skins/default/xui/en/panel_login.xml | 88 ++++++++++++----------
 indra/newview/skins/default/xui/en/strings.xml     |  9 ---
 4 files changed, 50 insertions(+), 112 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index a55201fd53..d03231a3fa 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION]
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
 Qt Webkit Version: [QT_WEBKIT_VERSION]
-Voice Server Version: [VOICE_VERSION]
+Vivox Version: [VIVOX_VERSION]
 </floater.string>
   <floater.string
      name="none">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c42b846dbb..e8ba8c683d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1382,18 +1382,6 @@ Unknown Vorbis encode failure on: [FILE]
 Unable to encode file: [FILE]
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="CorruptedProtectedDataStore"
-   type="alertmodal">
-  We are unable to read your protected data so it is being reset.
-   This may happen when you change network setup.
-
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-    
   <notification
    icon="alertmodal.tga"
    name="CorruptResourceFile"
@@ -2429,57 +2417,6 @@ Please choose the male or female avatar. You can change your mind later.
      notext="Female"
      yestext="Male"/>
   </notification>
-  <notification icon="alertmodal.tga"
-		name="CantTeleportToGrid"
-		type="alertmodal">
-Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]).  Please close your viewer and try again.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification icon="alertmodal.tga"
-		name="GeneralCertificateError"
-		type="alertmodal">
-Could not connect to the server.
-[REASON]
-
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-   </notification>
-
-  <notification icon="alertmodal.tga"
-		name="TrustCertificateError"
-		type="alertmodal">
-The certification authority for this server is not known.
-
-Certificate Information:
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
-
-Would you like to trust this authority?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Trust"/>
-  </notification>
 
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 539c5f785c..01adc00e1a 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,31 +48,50 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="850"
-min_width="850"
+width="695"
+min_width="695"
 user_resize="false"
 height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-name="username_text"
+name="first_name_text"
 top="20"
 left="20"
 width="150">
-Username:
+First name:
 </text>
 <line_editor
 follows="left|bottom"
 height="22"
-label="Username"
+label="First"
 left_delta="0"
 max_length="31"
-name="username_edit"
+name="first_name_edit"
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] Username"
+tool_tip="[SECOND_LIFE] First Name"
 top_pad="0"
-width="150" />
+   width="135" />
+  <text
+   follows="left|bottom"
+   font="SansSerifSmall"
+   height="16"
+   left_pad="8"
+   name="last_name_text"
+   top="20"
+   width="150">
+    Last name:   </text>
+<line_editor
+follows="left|bottom"
+height="22"
+label="Last"
+max_length="31"
+name="last_name_edit"
+select_on_focus="true"
+tool_tip="[SECOND_LIFE] Last Name"
+  top_pad="0"
+  width="135" />
 <text
 follows="left|bottom"
 font="SansSerifSmall"
@@ -80,7 +99,7 @@ height="15"
 left_pad="8"
 name="password_text"
 top="20"
-    width="135">
+    width="150">
        Password:
 </text>
 <line_editor
@@ -100,14 +119,26 @@ label="Remember password"
   top_pad="3"
   name="remember_check"
  width="135" />
+<button
+  follows="left|bottom"
+  height="23"
+  image_unselected="PushButton_On"
+  image_selected="PushButton_On_Selected"
+  label="Log In"
+  label_color="White"
+  layout="topleft"
+  left_pad="10"
+  name="connect_btn"
+  top="35"
+  width="90" />
   <text
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="10"
+  left_pad="18"
   name="start_location_text"
 top="20"
-  width="250">
+  width="130">
        Start at:
  </text>
 <combo_box
@@ -118,7 +149,7 @@ control_name="LoginLocation"
 max_chars="128"
 top_pad="0"
 name="start_location_combo"
-     width="250">
+     width="135">
 <combo_box.item
 label="My last location"
 name="MyLastLocation"
@@ -131,37 +162,16 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<button
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="connect_btn"
-  top="35"
-  width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="10"
-  name="start_location_text"
-top="20"
-  width="150">
-       Grid Name:
- </text>
 <combo_box
-follows="left|bottom"
 allow_text_entry="true"
 font="SansSerifSmall"
-height="23"
+   follows="left|right|bottom"
+   height="23"
+layout="topleft"
+top_pad="2"
 name="server_combo"
-top_pad="0"
-width="150"
-max_chars="255"
-visible="false" />
+width="135"
+  visible="false" />
 </layout_panel>
 <layout_panel
 follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9ac4ef9b37..0c73b8d769 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -46,15 +46,6 @@
 	<string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
 	<string name="LoginConnectingToRegion">Connecting to region...</string>
 	<string name="LoginDownloadingClothing">Downloading clothing...</string>
-        <string name="InvalidCertificate">The server returned an invalid or corrupt certificate. Please contact the Grid administrator.</string>
-        <string name="CertInvalidHostname">An invalid hostname was used to access the server, please check your SLURL or Grid hostname.</string>
-        <string name="CertExpired">The certificate returned by the Grid appears to be expired.  Please check your system clock, or contact your Grid administr\
-ator.</string>
-        <string name="CertKeyUsage">The certificate returned by the server could not be used for SSL.  Please contact your Grid administrator.</string>
-        <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain.  Please contact your Grid administrator.</string>
-        <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrat
-or.</string>
-
 	<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
-- 
cgit v1.2.3


From 8329dbdc37998c227600ca3693ca4767741798a0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 7 Apr 2010 18:33:05 +0300
Subject: Fixed major bug EXT-6661 (chat log paths reset back to default)  *
 Removed unused InstantMessageLogFolder  * Restored initializing logic of
 InstantMessageLogPath value from 1.23 to share setting between viewers.  *
 Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid
 removing of them in 2.0  * Restored default value of the "Save local chat
 log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was:
 LogChat)

Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_preferences_privacy.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_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 3d7f392404..fca9b4bca1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -84,7 +84,7 @@
     </text>
     <check_box
 	 enabled="false"
-     control_name="LogChat"
+     control_name="LogNearbyChat"
      height="16"
      label="Save nearby chat logs on my computer"
      layout="topleft"
-- 
cgit v1.2.3


From bc71f93ce3702407608d89371c5afb6c17330aae Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 7 Apr 2010 19:23:40 +0300
Subject: Fixed major bug  EXT-6602 (Sidebar panel focus goes to filter field,
 obscuring watermark text).

-Set focus on sidetray tabs open to tab containers which hold panels with lists, so now filter fields are not emptied. Used "default_tab_group" + "tab_group" attributes in xml to implement this.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_people.xml         | 2 ++
 indra/newview/skins/default/xui/en/panel_places.xml         | 2 ++
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 2 ++
 4 files changed, 8 insertions(+)

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

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 1b04d01abf..27d66945d9 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="408"
  label="Things"
@@ -61,6 +62,7 @@
      left="7"
      name="inventory filter tabs"
      tab_height="30"
+     tab_group="1"
      tab_position="top"
      tab_min_width="100"
      top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 6152dd1587..8131b75b70 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Side tray panel -->
 <panel
+ default_tab_group="1"
  follows="all"
  height="449"
  label="People"
@@ -56,6 +57,7 @@
      layout="topleft"
      left="5"
      name="tabs"
+     tab_group="1"
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c61007a9e1..5d1d1ab951 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="570"
  label="Places"
@@ -37,6 +38,7 @@ background_visible="true"
      name="Places Tabs"
      tab_min_width="80"
      tab_height="30"
+     tab_group="1"
      tab_position="top"
      top_pad="10"
      width="315" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c5efa2e221..73650a19dc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 background_visible="true"
+default_tab_group="1"
 follows="all"
 height="570"
 label="Outfits"
@@ -90,6 +91,7 @@ width="333">
    min_height="410"
    width="320"
    left="0"
+   tab_group="1"
    top_pad="6"
    follows="all" />
   <!--   <button
-- 
cgit v1.2.3


From 2288edf80ff87ca55b49b22b0f794083f78f86d9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 7 Apr 2010 13:35:30 -0700
Subject: VWR-17781 en_xui_change for fixing truncation in multiple languages,
 esp. ES, IT, NL

---
 .../default/xui/en/floater_hardware_settings.xml   | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 1e2440580e..27f8b4bb39 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -6,7 +6,7 @@
  name="Hardware Settings Floater"
  help_topic="hardware_settings_floater"
  title="HARDWARE SETTINGS"
- width="500">
+ width="615">
     <text
      type="string"
      length="1"
@@ -16,7 +16,7 @@
      left="10"
      name="Filtering:"
      top="20"
-     width="128">
+     width="188">
         Filtering:
     </text>
     <check_box
@@ -37,7 +37,7 @@
      left="10"
      name="Antialiasing:"
      top_pad="7"
-     width="128">
+     width="188">
         Antialiasing:
     </text>
     <combo_box
@@ -79,13 +79,13 @@
      increment="0.01"
      initial_value="1"
      label="Gamma:"
-     label_width="138"
+     label_width="198"
      layout="topleft"
      left="10"
      max_val="2"
      name="gamma"
      top_pad="7"
-     width="202" />
+     width="262" />
     <text
      type="string"
      length="1"
@@ -95,7 +95,7 @@
      left_pad="10"
      name="(brightness, lower is brighter)"
      top_delta="2"
-     width="315">
+     width="385">
         (0 = default brightness, lower = brighter)
     </text>
     <text
@@ -107,7 +107,7 @@
      left="10"
      name="Enable VBO:"
      top_pad="10"
-     width="128">
+     width="188">
         Enable VBO:
     </text>
     <check_box
@@ -128,14 +128,14 @@
      increment="16"
      initial_value="32"
      label="Texture Memory (MB):"
-     label_width="135"
+     label_width="195"
      layout="topleft"
      left="10"
      max_val="4096"
      name="GraphicsCardTextureMemory"
      tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
      top_pad="10"
-     width="300" />
+     width="360" />
     <spinner
      control_name="RenderFogRatio"
      decimal_digits="1"
@@ -143,14 +143,14 @@
      height="22"
      initial_value="4"
      label="Fog Distance Ratio:"
-     label_width="138"
+     label_width="198"
      layout="topleft"
      left_delta="0"
      max_val="10"
      min_val="0.5"
      name="fog"
      top_pad="7"
-     width="202" />
+     width="262" />
     <button
      follows="right|bottom"
      height="22"
-- 
cgit v1.2.3


From 6900278d7f787f8a3fe5d06e2eceb91c9dd9d5bd Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 7 Apr 2010 15:05:55 -0700
Subject: EXT-5646 Replace the "More >>" chevron with the art we use for the
 Favorites bar overflow (TabIcon_Close_Off and TabIcon_Close_Over). cc # 179

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 53dda1927a..ff2aae645b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -64,19 +64,31 @@
 		  function="MediaListCtrl.GoMediaPrefs" />
 	</button>
 	<button
-		name="more_less_btn"
+		name="more_btn"
 		follows="right"
 		tool_tip="Advanced Controls"
 		top_delta="0"
 		right="-8"
 		width="66"
 		height="22"
-		toggle="true"
 		label="More &gt;&gt;"
 		label_selected="Less &lt;&lt;">
 	  <button.commit_callback
 		  function="MediaListCtrl.MoreLess" />
 	</button>
+  <button
+		name="less_btn"
+		follows="right"
+		tool_tip="Advanced Controls"
+		top_delta="0"
+		right="-8"
+		width="66"
+		height="22"
+		label="More &gt;&gt;"
+		label_selected="Less &lt;&lt;">
+      <button.commit_callback
+        function="MediaListCtrl.MoreLess" />
+  </button>
   </panel>
   <panel
 	  name="nearby_media_panel"
-- 
cgit v1.2.3


From 66b3fbf17624d0127b40f6b083b00aa2837738e9 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 8 Apr 2010 08:06:40 +0300
Subject: Fixed major bug EXT-6605 (No profile verb button on Places panel)

- Added functionality of showing place profile to the LLPanelPlacesTab hierarchy. Use this functionality from LLPanelPlaces as callback for profile button click.

Reviewed my Mike Antipov at https://codereview.productengine.com/secondlife/r/191/

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 5d1d1ab951..a7a0efcdb3 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -134,5 +134,14 @@ background_visible="true"
          right="-10"
          top="1"
          width="60" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Profile"
+         layout="topleft"
+         name="profile_btn"
+         right="-1"
+         top="1"
+         width="111" />
     </panel>
 </panel>
-- 
cgit v1.2.3


From d218276bdcc1db433b2914553e3b3019d2bd45c7 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 8 Apr 2010 10:49:48 +0300
Subject: fixed EXT-3703 Startup toast message doesn't fit toast width *
 reverted changes made previously by rev. f0663aa57134; * added calculation of
 toast height difference based on LLTextBox::reshapeToFitText; * added
 vertical centering of message textbox; reviewed by Mike Antipov at
 https://codereview.productengine.com/secondlife/r/195/

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 11069b3ac3..e7384fa77f 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -64,7 +64,6 @@
    text_color="white"
    top="5"
    translate="false"
-   v_pad="5" 
    use_ellipses="true"
    width="260">
     Toast text;
-- 
cgit v1.2.3


From 5c1563e2cbee162de52cee321edb8148016865ba Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 8 Apr 2010 11:46:40 +0300
Subject: (final part) EXT-6564(major) - Fix wearable editing panels Updated
 Parameter panel: - removed hard coded values - improved panel layout

Reviewed by Mike Antipov, Neal Orman - https://codereview.productengine.com/secondlife/r/157/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_scrolling_param.xml | 51 +++++++++++-----------
 1 file changed, 26 insertions(+), 25 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index f9c86fc75b..8042563900 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- height="152"
+ height="157"
  layout="topleft"
  left="0"
  name="LLScrollingPanelParam"
@@ -10,25 +10,25 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left="4"
+     left="12"
      name="min param text"
-     top="116"
-     width="128" />
+     top="120"
+     width="120" />
     <text
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="6"
+     left="155"
      name="max param text"
      top_delta="0"
-     width="128" />
+     width="120" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left="8"
+     left="12"
      name="Loading..."
      top="11"
      width="128">
@@ -40,7 +40,7 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="6"
+     left="155"
      name="Loading...2"
      top_delta="0"
      width="128">
@@ -49,30 +49,30 @@
     <view_border 
      layout="topleft"
      follows="left|top"
-     left="2"
-     top="0"
+     left="7"
+     top="5"
      width="132"
      height="132"
      thickness="2"
-     shadow_light_color="LtGray_50"
-     highlight_light_color="LtGray_50"
-     highlight_dark_color="LtGray_50"
-     shadow_dark_color="LtGray_50"
+     shadow_light_color="0.3 0.3 0.3 1"
+     highlight_light_color="0.3 0.3 0.3 1"
+     highlight_dark_color="0.3 0.3 0.3 1"
+     shadow_dark_color="0.3 0.3 0.3 1"
      bevel_style="in"
      name="left_border"
     />
     <view_border 
      layout="topleft"
      follows="left|top"
-     left_pad="2"
+     left_pad="10"
      top_delta="0"
      width="132"
      height="132"
      thickness="2"
-     shadow_light_color="LtGray_50"
-     highlight_light_color="LtGray_50"
-     highlight_dark_color="LtGray_50"
-     shadow_dark_color="LtGray_50"
+     shadow_light_color="0.3 0.3 0.3 1"
+     highlight_light_color="0.3 0.3 0.3 1"
+     highlight_dark_color="0.3 0.3 0.3 1"
+     shadow_dark_color="0.3 0.3 0.3 1"
      bevel_style="in"
      name="right_border"
     />
@@ -84,10 +84,10 @@
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
-     left="2"
+     left="7"
      name="less"
      tab_stop="false"
-     top="0"
+     top="5"
      width="132" />
     <button
      enabled="false"
@@ -97,7 +97,7 @@
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
-     left_pad="2"
+     left_pad="10"
      name="more"
      tab_stop="false"
      top_delta="0"
@@ -111,10 +111,11 @@
      initial_value="0"
      label="[DESC]"
      label_width="100"
-     layout="topleft"
+     layout="bottom|left"
      left="6"
      max_val="100"
      name="param slider"
-     top="134"
-     width="258" />
+     bottom="1"
+     width="274" 
+     slider_label.font.style="BOLD" />
 </panel>
-- 
cgit v1.2.3


From dee74f53dcd65922ffe6528a305b6c00e77976bf Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 8 Apr 2010 15:06:42 +0300
Subject: Fixed normal bug EXT-6598 (Gesture pop-up menu too tall (fills height
 of screen))

- Limited height of gestures popup to 17 lines - 15 for gestures, 1 for label and 1 for separator. Used xml attribute "page_lines" to do it.

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

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

(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 c34a367c32..c6ca814f58 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -127,6 +127,8 @@
              <gesture_combo_list.combo_button
               pad_right="10"
               use_ellipses="true" />
+             <gesture_combo_list.combo_list
+              page_lines="17" />
          </gesture_combo_list>
         </layout_panel>
 		 <icon
-- 
cgit v1.2.3


From 978d62e9e75d52a3443db36fd02062c3dbf4040a Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 8 Apr 2010 18:56:02 +0300
Subject: Fixed normal bug EXT-6751 (Wrong "You paid" text in notification when
 creating a classified).

- Bug was caused by absence of localizable string for "You paid..." notifications without name and reason simultaneously.
Added such string("you_paid_ldollars_no_info") to strings.xml and used it in code.

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

--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 0c73b8d769..27d11ead7e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3056,6 +3056,7 @@ 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_info">You paid L$[AMOUNT].</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>
-- 
cgit v1.2.3


From 11db894ba9ab361589078db3fa744970e9137298 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 8 Apr 2010 16:04:18 -0700
Subject: EXT-6557 Login screen menus disappear on restore down reviewed by
 Richard cc#181

---
 indra/newview/skins/default/xui/en/menu_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/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4655fa8c46..e95300a4b3 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar
- follows="left|top|right"
+ follows="left|top"
  height="18"
  layout="topleft"
  left_delta="0"
-- 
cgit v1.2.3


From 6d6b565cd72f076f7d1be1dcff4e737c8f66d006 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 9 Apr 2010 10:56:11 +0300
Subject: =?UTF-8?q?Fixed=20normal=20bug=20EXT-6730=20([TRUNCATION]=20Prefe?=
 =?UTF-8?q?rencias=20>=20Configurar=20>=20Otros=20dispositivos=20>=20CONFI?=
 =?UTF-8?q?GURACI=C3=93N=20DEL=20JOYSTICK.=20\"Zona=20muerta=20izq./de\")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixed truncation problem in EN locale. Increased textbox size.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_joystick.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_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 4d67e4c343..b8156a174d 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -819,7 +819,7 @@
      layout="topleft"
      left="20"
      name="ZoomDeadZone"
-     width="94">
+     width="96">
         Zoom Dead Zone
     </text>
     <spinner
-- 
cgit v1.2.3


From 6d78a90636ecd0d6bf8266c3020cc31d7f233052 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 9 Apr 2010 10:58:39 +0300
Subject: Fixed normal bug EXT-6596 (Icons not vertically centered on navbar
 buttons)

- Moved the Home button icon up 1 pxl

Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/202/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_navigation_bar.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_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index a314cedc21..7ec1ca2e2e 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -66,6 +66,7 @@
 	    <button
 	     follows="left|top"
 	     height="23"
+	     image_bottom_pad="1"
 	     image_overlay="Home_Off"
 	     layout="topleft"
 	     left_pad="7"
-- 
cgit v1.2.3


From 9d93441b3117c59652fbb81abea2983f3cbca203 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 9 Apr 2010 12:30:33 +0300
Subject: done EXT-6687 Implement Save button functionality (Edit Outfit panel)

Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/179

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_save_outfit.xml      | 22 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_outfit_edit.xml     | 13 +++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_save_outfit.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
new file mode 100644
index 0000000000..a8778df7f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="201"
+ layout="topleft"
+ mouse_opaque="false"
+ name="save_outfit_menu"
+ width="120">
+    <menu_item_call 
+     name="save_outfit" 
+     label="Save">
+        <menu_item_call.on_click 
+         function="Outfit.Save.Action"
+         userdata=""/>
+        </menu_item_call>
+    <menu_item_call 
+     name="save_as_new_outfit" 
+     label="Save As New">
+        <menu_item_call.on_click 
+         function="Outfit.SaveAsNew.Action"
+         userdata="" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index c1800384a3..3fa3d6d039 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -337,6 +337,19 @@
          layout="topleft"
          name="save_btn"
          width="145" />
+        <button
+         follows="bottom|right"
+         height="23"
+         name="save_flyout_btn"
+         label=""
+         left_pad="-20"
+         tab_stop="false"
+         image_selected="SegmentedBtn_Right_Selected_Press"
+         image_unselected="SegmentedBtn_Right_Off"
+         image_pressed="SegmentedBtn_Right_Press"
+         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+         image_overlay="Arrow_Small_Up"
+         width="20"/>
         <button
          follows="bottom|left|right"
          height="23"
-- 
cgit v1.2.3


From 43c85b0dfb4e7e7c9fdfc02954bbb0115ec344c4 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 9 Apr 2010 15:07:42 +0300
Subject: done EXT-6716 Implement Add button functionality for adding a
 wearable to Current Outfit (Edit Outfit panel)

Added temporary PLUS button on the button bar under the top list of Edit Outfit panel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/203/

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 3fa3d6d039..a5e6506463 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -257,7 +257,7 @@
              text_pad_left="25" />
 
             <inventory_panel
-             allow_multi_select="true"
+             allow_multi_select="false"
              border="false"
              follows="left|top|right|bottom"
              height="176"
@@ -317,6 +317,19 @@
                  name="list_view_btn"
                  top="1"
                  width="31" />
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 label=""
+                 layout="topleft"
+                 left_pad="1"
+                 name="add_to_outfit_btn"
+                 top="1"
+                 width="31" />
             </panel>
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3


From cf9af33a1ab7062325bc45feff0335c525e44499 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 9 Apr 2010 18:29:32 +0300
Subject: Fixed normal bug  EXT-6319 (Rejected voice call says "user Joined the
 voice call").

- Removed names from strings containing info about other user joining or ending the call to make them more general. See comment to JIRA ticket for more info.

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

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index 2bafd1bdef..5ea207675b 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -100,7 +100,7 @@ No Answer.  Please try again later.
    top="27"
    width="315"
    word_wrap="true">
-    [VOICE_CHANNEL_NAME] has ended the call.  [RECONNECT_NEARBY]
+    Your call has ended.  [RECONNECT_NEARBY]
   </text>
   <text
    font="SansSerifLarge"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 27d11ead7e..b0bf51c214 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2940,6 +2940,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_moderator_label">(Moderator)</string>
 
 	<!-- voice calls -->
+	<string name="answered_call">Your call has been answered</string>
 	<string name="started_call">Started a voice call</string>
 	<string name="joined_call">Joined the voice call</string>
 
-- 
cgit v1.2.3


From 469e06f8afc124fcd6a627b9c2478b8668bfd812 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 9 Apr 2010 13:11:21 -0700
Subject: EXT-6796 - selecting emote in animation upload preview doesn't do
 anything reviewed by Mani

---
 .../default/xui/en/floater_animation_preview.xml   | 152 ++++++++++++---------
 .../skins/default/xui/en/floater_image_preview.xml |  30 ++--
 2 files changed, 108 insertions(+), 74 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 9dff4abe2c..cb6b2f6ebc 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -333,66 +333,86 @@ Maximum animation length is [MAX_LENGTH] seconds.
      left_pad="20"
      name="emote_combo"
      tool_tip="Controls what face does during animation">
-        <combo_box.item
-         label="(None)"
-         name="[None]" />
-        <combo_box.item
-         label="Aaaaah"
-         name="Aaaaah" />
-        <combo_box.item
-         label="Afraid"
-         name="Afraid" />
-        <combo_box.item
-         label="Angry"
-         name="Angry" />
-        <combo_box.item
-         label="Big Smile"
-         name="BigSmile" />
-        <combo_box.item
-         label="Bored"
-         name="Bored" />
-        <combo_box.item
-         label="Cry"
-         name="Cry" />
-        <combo_box.item
-         label="Disdain"
-         name="Disdain" />
-        <combo_box.item
-         label="Embarrassed"
-         name="Embarrassed" />
-        <combo_box.item
-         label="Frown"
-         name="Frown" />
-        <combo_box.item
-         label="Kiss"
-         name="Kiss" />
-        <combo_box.item
-         label="Laugh"
-         name="Laugh" />
-        <combo_box.item
-         label="Plllppt"
-         name="Plllppt" />
-        <combo_box.item
-         label="Repulsed"
-         name="Repulsed" />
-        <combo_box.item
-         label="Sad"
-         name="Sad" />
-        <combo_box.item
-         label="Shrug"
-         name="Shrug" />
-        <combo_box.item
-         label="Smile"
-         name="Smile" />
-        <combo_box.item
-         label="Surprise"
-         name="Surprise" />
-        <combo_box.item
-         label="Wink"
-         name="Wink" />
-        <combo_box.item
-         label="Worry"
-         name="Worry" />
+      <item
+       label="(None)"
+       value=""
+       name="[None]" />
+      <item
+       label="Aaaaah"
+       value="Aaaaah"
+       name="Aaaaah" />
+      <item
+       label="Afraid"
+       value="Afraid"
+       name="Afraid" />
+      <item
+       label="Angry"
+       value="Angry"
+       name="Angry" />
+      <item
+       label="Big Smile"
+       value="Big Smile"
+       name="BigSmile" />
+      <item
+       label="Bored"
+       value="Bored"
+       name="Bored" />
+      <item
+       label="Cry"
+       value="Cry"
+       name="Cry" />
+      <item
+       label="Disdain"
+       value="Disdain"
+       name="Disdain" />
+      <item
+       label="Embarrassed"
+       value="Embarrassed"
+       name="Embarrassed" />
+      <item
+       label="Frown"
+       value="Frown"
+       name="Frown" />
+      <item
+       label="Kiss"
+       value="Kiss"
+       name="Kiss" />
+      <item
+       label="Laugh"
+       value="Laugh"
+       name="Laugh" />
+      <item
+       label="Plllppt"
+       value="Plllppt"
+       name="Plllppt" />
+      <item
+       label="Repulsed"
+       value="Repulsed"
+       name="Repulsed" />
+      <item
+       label="Sad"
+       value="Sad"
+       name="Sad" />
+      <item
+       label="Shrug"
+       value="Shrug"
+       name="Shrug" />
+      <item
+       label="Smile"
+       value="Smile" 
+       name="Smile" />
+      <item
+       label="Surprise"
+       value="Surprise" 
+       name="Surprise" />
+      <item
+       label="Wink"
+       value="Wink"
+       name="Wink" />
+      <item
+       label="Worry"
+       value="Worry"
+       name="Worry" />
     </combo_box>
     <text
      type="string"
@@ -414,17 +434,21 @@ Maximum animation length is [MAX_LENGTH] seconds.
      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
+        <item
          label="Standing"
+         value="Standing"
          name="Standing" />
-        <combo_box.item
+        <item
          label="Walking"
+         value="Walking"
          name="Walking" />
-        <combo_box.item
+        <item
          label="Sitting"
+         value="Sitting"
          name="Sitting" />
-        <combo_box.item
+        <item
          label="Flying"
+         value="Flying"
          name="Flying" />
     </combo_box>
     <spinner
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 6f8f272128..86232de1a4 100644
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -64,35 +64,45 @@
      name="clothing_type_combo"
      top_delta="3"
      width="160">
-        <combo_box.item
+        <item
          label="Image"
+         value="Image"
          name="Image" />
-        <combo_box.item
+        <item
          label="Hair"
+         value="Hair"
          name="Hair" />
-        <combo_box.item
+        <item
          label="Female Head"
+         value="Female Head"
          name="FemaleHead" />
-        <combo_box.item
+        <item
          label="Female Upper Body"
+         value="Female Upper Body"
          name="FemaleUpperBody" />
-        <combo_box.item
+        <item
          label="Female Lower Body"
+         value="Female Lower Body"
          name="FemaleLowerBody" />
-        <combo_box.item
+        <item
          label="Male Head"
+         value="Male Head"
          name="MaleHead" />
-        <combo_box.item
+        <item
          label="Male Upper Body"
+         value="Male Upper Body"
          name="MaleUpperBody" />
-        <combo_box.item
+        <item
          label="Male Lower Body"
+         value="Male Lower Body"
          name="MaleLowerBody" />
-        <combo_box.item
+        <item
          label="Skirt"
+         value="Skirt"
          name="Skirt" />
-        <combo_box.item
+        <item
          label="Sculpted Prim"
+         value="Sculpted Prim"
          name="SculptedPrim" />
     </combo_box>
     <text
-- 
cgit v1.2.3


From 103083b52def07c140dfc8f28989b5f4a93d288a Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 9 Apr 2010 19:35:20 -0700
Subject: en_xui_change and undo old overrides, for advanced graphic pref panel

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.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_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 44c44f5f59..7ab74855a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -287,7 +287,7 @@
 		left_delta="2"
 		name="AvatarRenderingText"
 		top_pad="5"
-		width="128">
+		width="158">
 			Avatar rendering:
 		</text>
 		<check_box
-- 
cgit v1.2.3


From 85f1954a1708eba2e2ea1f4e9d2c70295c128e02 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 12 Apr 2010 15:14:51 +0300
Subject: Fixed major bug EXT-6606 (Set As Profile Pic uploads and charges user
 L$10 without confirmation).

Added upload confirmation dialog.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/217/

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e8ba8c683d..ff8de3514f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4375,6 +4375,18 @@ Uploading in-world and web site snapshots...
 (Takes about 5 minutes.)
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="UploadConfirmation"
+   type="alertmodal">
+Uploading costs L$[AMOUNT].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Upload"/>
+  </notification>
+
   <notification
    icon="notify.tga"
    name="UploadPayment"
-- 
cgit v1.2.3


From f98f79be8fdec2cf4d234abe9c6837deef0a81e0 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 12 Apr 2010 15:20:27 +0300
Subject: Fixed major bug EXT-6590 (Preference> Maturity rating changes without
 direct user input).

Now we're notifying user that his/her maturity preference has been changed.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/216/

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ff8de3514f..7f0e8891d7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3379,6 +3379,13 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
     </form>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="PreferredMaturityChanged"
+   type="notifytip">
+Your maturity rating preference is now [RATING].
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="LandClaimAccessBlocked"
-- 
cgit v1.2.3


From 27b457f2ce860f7fc36d15e8792bfa89bca5b93f Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 12 Apr 2010 17:02:16 +0300
Subject: Implemented major task EXT-6710(Feature request: Allow drag and drop
 from Inventory panel to Resident Picker)  - added handling the drag add drop
 inventory items to resident picker  - added "Share" verb button to the
 inventory panel which opens resident picker  - added "Share" menu item to the
 individual inventory context menu which acts as verb button Reviewed by Mike
 Antipov at https://codereview.productengine.com/secondlife/r/215/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_inventory.xml        |  8 ++++++++
 .../newview/skins/default/xui/en/notifications.xml |  7 +++++++
 .../skins/default/xui/en/sidepanel_inventory.xml   | 24 +++++++++++++++-------
 3 files changed, 32 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 2874151df5..5e1f6b58e8 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -4,6 +4,14 @@
  layout="topleft"
  name="Popup"
  visible="false">
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share"
+     visible="true">
+        <menu_item_call.on_click
+         function="Inventory.Share" />
+    </menu_item_call>
     <menu_item_call
      label="Buy"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7f0e8891d7..9ee4e13f3c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5961,6 +5961,13 @@ Selected button can not be shown right now.
 The button will be shown when there is enough space for it.
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="ShareNotification"
+   type="notifytip">
+Drag items from inventory onto a person in the resident picker
+  </notification>
+
 
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a233d42568..812d94c55f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -46,17 +46,27 @@
 				 left="0"
 				 name="info_btn"
 				 top="0"
-				 width="153" />
+				 width="102" />
+			<button
+				 enabled="true"
+				 follows="bottom|left"
+				 height="23"
+				 label="Share"
+				 layout="topleft"
+				 left="105"
+				 name="share_btn"
+				 top="0"
+				 width="102" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
 				 height="23"
 				 label="Wear"
 				 layout="topleft"
-				 left="156"
+				 left="210"
 				 name="wear_btn"
 				 top="0"
-				 width="152" />
+				 width="102" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
@@ -64,19 +74,19 @@
 				 label="Play"
 				 layout="topleft"
 				 name="play_btn"
-				 left="156"
+				 left="210"
 				 top="0"
-				 width="152" />
+				 width="102" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
 				 height="23"
 				 label="Teleport"
 				 layout="topleft"
-				 left="156"
+				 left="210"
 				 name="teleport_btn"
 				 top="0"
-				 width="152" />
+				 width="102" />
 		</panel>
 	</panel>
 
-- 
cgit v1.2.3


From 73d07c93255a24f0ea23453f8ed180ce1d63a78a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 12 Apr 2010 17:09:50 +0300
Subject: fixed major EXT-6593 "New notifications arrived while you were away"
 is bold and doesn't fit on toast * Unbolded startup toast message text; *
 Avoided increasing complexity of LLToastNotifyPanel class that in future
 should be decoupled on separate independent toast panel implementations and
 added LLPanelGenericTip class to represent generic notifytip panels.

reviewed by Vadim Savchuk and Mike Antipov at
https://codereview.productengine.com/secondlife/r/214/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_generic_tip.xml     | 23 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/panel_toast.xml |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_generic_tip.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
new file mode 100644
index 0000000000..453ed7c7a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="40"
+ layout="topleft"
+ left="0"
+ name="panel_system_tip"
+ top="0"
+ width="305">
+    <text
+     follows="all"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     max_length="350"
+     name="message"
+     text_color="white"
+     top="10"
+     use_ellipses="true"
+     value=""
+     width="285"
+     wrap="true" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index e7384fa77f..92b4c17247 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -55,7 +55,7 @@
     clip_partial="true" 
    visible="false"
    follows="left|top|right|bottom"
-   font="SansSerifBold"
+   font="SansSerif"
    height="20"
    layout="topleft"
    left="20"
-- 
cgit v1.2.3


From a813ec6ecbee8b5cd5e474892ff2f2eb838e6d27 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 12 Apr 2010 14:11:13 -0700
Subject: VWR-17833 en_xui_change to cover PT (logest translation)

---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8131b75b70..233137a76b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -477,7 +477,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          label="Share"
          layout="topleft"
          name="share_btn"
-         width="62" />
+         width="85" />
         <button
          follows="bottom|left"
          left_pad="3"
-- 
cgit v1.2.3


From bb617018fbc18f5f506b4aa71ac01778406613c9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 12 Apr 2010 14:28:01 -0700
Subject: VWR-17849 en_xui_change to cover ES (longest translation)

---
 indra/newview/skins/default/xui/en/floater_customize.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_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 6f2b0fc3ea..32460e937d 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -3365,7 +3365,7 @@
      layout="topleft"
      name="make_outfit_btn"
      right="-218"
-     width="100" />
+     width="120" />
     <button
      bottom="574"
      follows="right|bottom"
-- 
cgit v1.2.3


From 95343d8085d98cf0927747298cd4af7a9ea90766 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 12 Apr 2010 16:05:08 -0700
Subject: EXT-6817 en_xui_change and remove old overrides

---
 indra/newview/skins/default/xui/en/panel_region_estate.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/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index c5b2512fba..9186efc431 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -33,7 +33,7 @@
      left_delta="0"
      name="estate_text"
      top_pad="2"
-     width="80">
+     width="140">
         Estate:
     </text>
     <text
@@ -59,7 +59,7 @@
      left_delta="0"
      name="owner_text"
      top_pad="2"
-     width="80">
+     width="150">
         Estate owner:
     </text>
     <text
@@ -191,19 +191,19 @@
      height="23"
      label="Send Message To Estate..."
      layout="topleft"
-     left="50"
+     left="20"
      name="message_estate_btn"
      top_pad="20"
-     width="160" />
+     width="220" />
     <button
      follows="left|top"
      height="23"
      label="Kick Resident from Estate..."
      layout="topleft"
-     left="50"
+     left="20"
      name="kick_user_from_estate_btn"
      top_pad="5"
-     width="160" />
+     width="220" />
 
     <text
      type="string"
-- 
cgit v1.2.3


From 4f20b91acdddc06b7e033afa42e19f993f7efb30 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 13 Apr 2010 10:55:00 +0300
Subject: Fixed normal bug EXT-5973 (converstations button flash count and rate
 needs to be controllable)

Made flashing count and period for IM Well and Notification Well icons configurable via viewer settings: WellIconFlashCount, WellIconFlashPeriod.
Due to Flash Timer is implemented as derived class from EventTimer it is impossible to change period in runtime. So, both settings are made as required restart.

Also removed deprecated "flash_to_lit_count" & "flash_period" widget params.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 2 --
 1 file changed, 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 c6ca814f58..e412c491fd 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -346,7 +346,6 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          user_resize="false">
             <chiclet_im_well
              max_displayed_count="99"
-             flash_period="0.3"
              follows="right"
              height="28"
              layout="topleft"
@@ -395,7 +394,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          min_width="37"
          user_resize="false">
             <chiclet_notification
-             flash_period="0.25"
              follows="right"
              height="23"
              layout="topleft"
-- 
cgit v1.2.3


From ab246784b069913363e544ab3c9a9fb615e0c71d Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 13 Apr 2010 13:32:39 +0300
Subject: Fixed normal bug EXT-6034 (Need "View People Icons" option for group
 IM window) - added new menu item to participant list menu for group and
 ad-hoc chats. Reviewed by Mike Antipov at
 https://codereview.productengine.com/secondlife/r/225/.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_participant_list.xml      | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(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 d03a7e3d41..59c7f4ed85 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -82,8 +82,21 @@
          function="ParticipantList.EnableItem"
          parameter="can_pay" />
     </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+    <menu_item_separator
+        layout="topleft"
+        name="View Icons Separator" />
+    <menu_item_check
+        label="View People Icons"
+        name="View Icons">
+      <on_click
+          function="ToggleControl"
+          parameter="ParticipantListShowIcons"/>
+      <on_check
+          function="CheckControl"
+          parameter="ParticipantListShowIcons" />
+    </menu_item_check>
+    <menu_item_separator
+        layout="topleft" />
     <menu_item_check
      label="Block Voice"
      layout="topleft"
-- 
cgit v1.2.3


From 613b4e9361df55da3863a546c806493d48f848f3 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 13 Apr 2010 13:37:14 +0300
Subject: done EXT-6675 Fix TRASH btn on Edit Outfit panel to remove an item
 from avatar (from COF)

Trash button removes from avatar a selected item only of "clothing" and "object" types

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/209/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.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_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index a5e6506463..9ece4aead8 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -211,7 +211,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 name="trash_btn"
+                 name="remove_from_outfit_btn"
                  right="-1"
                  top="1"
                  width="31" />
-- 
cgit v1.2.3


From 91e00620d8ac1f57c8e22ca568ba2d0fcd7cbdfc Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 13 Apr 2010 21:39:13 +0300
Subject: Fixed normal bug  EXT-4915 (Duplicated "Buy" item in object context
 menu).

- Bug was caused by making "Take" menu item from object context menu consistent with the one from Build->Object menu where it was replaced by "Buy" when it was needed. But in object menu we already have "Buy" option at the bottom of the list so we don't need to hide "Take" and show "Buy" instead. Removed appearance of "Buy" instead of "Take" and made "Take" item's behaviour consistent with "Take" from object inspector gear menu.

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

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 2c97112e38..8b10c7b049 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -137,27 +137,14 @@
     </menu_item_call>
     </context_menu>
    <menu_item_separator layout="topleft" />
-   <menu_item_call
-    label="Buy"
-    layout="topleft"
-    name="Pie Object Bye">
-      <menu_item_call.on_click
-       function="Tools.BuyOrTake"/>
-      <menu_item_call.on_visible
-       function="Tools.VisibleBuyObject"/>
-      <menu_item_call.on_enable
-       function="Tools.EnableBuyOrTake"/>
-   </menu_item_call>
    <menu_item_call
      label="Take"
      layout="topleft"
      name="Pie Object Take">
       <menu_item_call.on_click
-       function="Tools.BuyOrTake"/>
-      <menu_item_call.on_visible
-       function="Tools.VisibleTakeObject"/>
+       function="Object.Take"/>
       <menu_item_call.on_enable
-       function="Tools.EnableBuyOrTake"/>
+       function="Object.VisibleTake"/>
    </menu_item_call>
    <menu_item_call
    enabled="false"
-- 
cgit v1.2.3


From df39e34a35a2764eafad362ebf73915420fd01e2 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 11:39:24 -0700
Subject: VWR-17950 en_xui_change and remove 'es' override

---
 indra/newview/skins/default/xui/en/floater_windlight_options.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_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index d09a41978d..85a5be369c 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1132,7 +1132,7 @@
              layout="topleft"
              left_delta="0"
              name="BHText8"
-             top_pad="5"
+             top_pad="8"
              width="10">
                 X
             </text>
@@ -1145,7 +1145,7 @@
              initial_value="0.5"
              layout="topleft"
              left_pad="3"
-             top_pad="6"
+             top_pad="8"
              name="WLCloudDetailX"
              width="200" />
             <text
-- 
cgit v1.2.3


From 4c0a3a3e9d601089c3213ad9ccbe6b4c1f66398d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 11:55:47 -0700
Subject: EXT-6837 en_xui_change partial fix to widen text label width to show
 text, but still need PE fix to redesign/widen border to fit translation in;
 removing old overrides

---
 indra/newview/skins/default/xui/en/floater_day_cycle_options.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_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 8c5af2283d..c684a1ee77 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -334,7 +334,7 @@
              left="20"
              name="WLCurKeyFrameText"
              top="104"
-             width="150">
+             width="235">
                 Key Frame Settings:
             </text>
             <text
-- 
cgit v1.2.3


From cdd806db4a535a36b7c486b91cc4c70a66e1b27d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 11:59:37 -0700
Subject: VWR-17953 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_day_cycle_options.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_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index c684a1ee77..2c0c8d45b3 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -392,7 +392,7 @@
              left="30"
              name="WLCurKeyTimeText2"
              top="169"
-             width="120">
+             width="185">
                 Key Preset:
             </text>
             <combo_box
-- 
cgit v1.2.3


From 88782e75462ac3a959a59be97ff50b5fc34aabb9 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 13 Apr 2010 16:36:48 -0400
Subject: EXT-6840 : Miscellaneous Avatar Debug Textures Floater improvements

Changed "Debug" into "Debug Textures" on right-click menu.
Added "Debug Textures" to right-click menu for self (so you don't need to CTRL+SHIFT+ALT+A).
Prettied up the dump textures console output.
Fixed a bug where component textures for yourself were showing up when viewing others (you shouldn't see any component textures when viewing others).
Enlarged debug textures floater a bit.
---
 indra/newview/skins/default/xui/en/floater_avatar_textures.xml  | 4 ++--
 indra/newview/skins/default/xui/en/menu_attachment_other.xml    | 2 +-
 indra/newview/skins/default/xui/en/menu_attachment_self.xml     | 9 ++++++++-
 indra/newview/skins/default/xui/en/menu_avatar_other.xml        | 2 +-
 indra/newview/skins/default/xui/en/menu_avatar_self.xml         | 8 ++++++++
 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml   | 8 ++++++++
 7 files changed, 29 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index 54b6edb0ec..e30e958543 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="650"
+ height="660"
  layout="topleft"
  name="avatar_texture_debug"
  help_topic="avatar_texture_debug"
  title="AVATAR TEXTURES"
- width="1250">
+ width="1253">
     <floater.string
      name="InvalidAvatar">
         INVALID AVATAR
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index c5b31c7f63..b46b62ec4d 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -72,7 +72,7 @@
              function="Avatar.EnableFreezeEject"/>
         </menu_item_call>
         <menu_item_call
-         label="Debug"
+         label="Debug Textures"
          name="Debug...">
             <menu_item_call.on_click
              function="Avatar.Debug" />
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 281ec5a7c3..5c30b9ee94 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -99,5 +99,12 @@
          function="ShowAgentProfile"
          parameter="agent" />
     </menu_item_call>
-    
+  <menu_item_call
+ label="Debug Textures"
+     name="Debug...">
+    <menu_item_call.on_click
+     function="Avatar.Debug" />
+    <menu_item_call.on_visible
+     function="IsGodCustomerService"/>
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index ac9101cfd9..276b5f106f 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -72,7 +72,7 @@
              function="Avatar.EnableFreezeEject"/>
         </menu_item_call>
         <menu_item_call
-         label="Debug"
+         label="Debug Textures"
          name="Debug...">
             <menu_item_call.on_click
              function="Avatar.Debug" />
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 1e32cfd9df..a21c1ac44b 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -215,4 +215,12 @@
          function="ShowAgentProfile"
          parameter="agent" />
     </menu_item_call>
+    <menu_item_call
+		 label="Debug Textures"
+         name="Debug...">
+            <menu_item_call.on_click
+             function="Avatar.Debug" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index a5ac5f76e1..334decdf58 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -89,7 +89,7 @@
      function="InspectAvatar.VisibleFreezeEject"/>
   </menu_item_call>
   <menu_item_call
-   label="Debug"
+   label="Debug Textures"
    name="debug">
     <menu_item_call.on_click
      function="Avatar.Debug"/>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
index 9dc2611663..03bd93e271 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -45,4 +45,12 @@
      function="SideTray.PanelPeopleTab"
      parameter="groups_panel" />
   </menu_item_call>
+  <menu_item_call
+ label="Debug Textures"
+     name="Debug...">
+    <menu_item_call.on_click
+     function="Avatar.Debug" />
+    <menu_item_call.on_visible
+     function="IsGodCustomerService"/>
+  </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From 52913616ffb1bc16e1f095098d8d70defe99f955 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 14:16:09 -0700
Subject: VWR-17955 en_xui_change; remove old override

---
 indra/newview/skins/default/xui/en/floater_perm_prefs.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_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 4909b8988f..ff454e3ebf 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -44,7 +44,7 @@
          left_delta="0"
          name="NextOwnerLabel"
          top_pad="5"
-         width="150">
+         width="200">
             Next owner can:
         </text>
         <check_box
-- 
cgit v1.2.3


From 3a1a43bfa685285e017d74a5156fd23e883aee8d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 13 Apr 2010 14:33:01 -0700
Subject: VWR-18599 en_xui_change

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.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_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index eb2112c586..3ef16d2dec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -342,7 +342,7 @@
      layout="topleft"
      left="30"
      height="20"
-     width="120"
+     width="170"
      top_pad="20">
      Show IMs in:
     </text>
@@ -351,9 +351,9 @@
      follows="left|top"
      layout="topleft"
      top_delta="0" 
-     left="120" 
+     left="170" 
   	 height="20"
-	   width="100"
+	   width="130"
      text_color="White_25"
 	  >
       (requires restart)
-- 
cgit v1.2.3


From 5e34a91ce65bbd74834ae012552b3ebe8592fe9a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 14 Apr 2010 12:17:47 +0300
Subject: Fixed  normal bug EXT-4301 (PDD: Dial-in to a PSTN bridge shows
 "(???) (???)" for the name.)

* Implementation notes:
** special item is cloned from VCP to be used in LLAvatarList to reflect an Avaline caller.
** LLAvatarList extended to create instances of Avaline Caller
** Participant list now determines type of adding session participant (Avatar/Avaline Caller) and selects a way item will be created in avatar list

* Implementation behavior:
** The problem is when Avaline caller ends a call it is removed from Voice Client session but
   still exists in LLSpeakerMgr. Server does not send such information.
   HUCK was implemented to notify subscribers that Avaline callers are not anymore in the voice call.
** For now Avaline Caller is removed from the LLSpeakerMgr List when it is removed from the Voice Client session.
   This happens in two cases: if Avaline Caller ends call itself or if Resident ends group call.

** If Resident joins group call where Avaline caller already exists that caller will appear in Resident's viewer (VCP & Group IM window)
** The callers are displayed as "AvaLine Caller 1", "AvaLine Caller 2" etc.

* Known issues:
** LLNonAvatarCaller should be removed from VCP (for avaline p2p calls). Updated Avatar & Participant Lists can be used instead of it.
    Separate ticket will be opened to refactor this code.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 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 b0bf51c214..813f59ff89 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,6 +148,8 @@
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
+	<string name="AvalineCaller">Avaline Caller [ORDER]</string>
+
 	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
 	<string name="AssetErrorNone">No error</string>
 	<string name="AssetErrorRequestFailed">Asset request: failed</string>
-- 
cgit v1.2.3


From f4a03a397575b1b4a54bfe289a155acd6c831441 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 14 Apr 2010 12:56:11 +0300
Subject: =?UTF-8?q?Fixed=20normal=20bug=20EXT-6730=20([TRUNCATION]=20Prefe?=
 =?UTF-8?q?rencias=20>=20Configurar=20>=20Otros=20dispositivos=20>=20CONFI?=
 =?UTF-8?q?GURACI=C3=93N=20DEL=20JOYSTICK.=20\"Zona=20muerta=20izq./de\")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. In EN locale increased size of all TextBoxes where string was truncated. Made these TextBoxes large enough to contain strings of all locales. Moved controls next to these TextBoxes to the right and increased floater width to accommodate its content.

2. Deleted in ES, IT, NL, PL, FR explicitly overriden 'left' and 'width' attributes that was changed in EN locale.

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_joystick.xml      | 154 ++++++++++-----------
 1 file changed, 77 insertions(+), 77 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index b8156a174d..6e1bb8fcd0 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -6,7 +6,7 @@
  name="Joystick"
  help_topic="joystick"
  title="JOYSTICK CONFIGURATION"
- width="550">
+ width="569">
     <floater.string
      name="NoDevice">
         no device detected
@@ -148,7 +148,7 @@
      halign="right"
      height="10"
      layout="topleft"
-     left="12"
+     left="37"
      mouse_opaque="false"
      name="Control Modes:"
      top="110"
@@ -161,7 +161,7 @@
      halign="center"
      label="Avatar"
      layout="topleft"
-     left="125"
+     left="150"
      name="JoystickAvatarEnabled"
      width="60" />
     <check_box
@@ -170,7 +170,7 @@
      halign="center"
      label="Build"
      layout="topleft"
-     left="194"
+     left="219"
      name="JoystickBuildEnabled"
      width="60" />
     <check_box
@@ -179,14 +179,14 @@
      halign="center"
      label="Flycam"
      layout="topleft"
-     left="262"
+     left="289"
      name="JoystickFlycamEnabled"
      width="60" />
     <stat_view
      height="250"
      label="Joystick Monitor"
      layout="topleft"
-     left="340"
+     left="359"
      name="axis_view"
      show_label="true"
      top="142"
@@ -250,9 +250,9 @@
      bottom="144"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="XScale"
-     width="94">
+     width="140">
         X Scale
     </text>
     <spinner
@@ -261,7 +261,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale1"
@@ -272,7 +272,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale1"
@@ -283,7 +283,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale1"
@@ -294,9 +294,9 @@
      bottom="164"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YScale"
-     width="94">
+     width="140">
         Y Scale
     </text>
     <spinner
@@ -305,7 +305,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale2"
@@ -316,7 +316,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale2"
@@ -327,7 +327,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale2"
@@ -338,9 +338,9 @@
      bottom="184"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZScale"
-     width="94">
+     width="140">
         Z Scale
     </text>
     <spinner
@@ -349,7 +349,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="50"
      min_val="-50"
      name="AvatarAxisScale0"
@@ -360,7 +360,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale0"
@@ -371,7 +371,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale0"
@@ -382,9 +382,9 @@
      bottom="204"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="PitchScale"
-     width="94">
+     width="140">
         Pitch Scale
     </text>
     <spinner
@@ -393,7 +393,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="1024"
      min_val="-1024"
      name="AvatarAxisScale4"
@@ -404,7 +404,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale4"
@@ -415,7 +415,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale4"
@@ -426,9 +426,9 @@
      bottom="224"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YawScale"
-     width="94">
+     width="140">
         Yaw Scale
     </text>
     <spinner
@@ -437,7 +437,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      max_val="1024"
      min_val="-1024"
      name="AvatarAxisScale5"
@@ -448,7 +448,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale5"
@@ -459,7 +459,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale5"
@@ -470,9 +470,9 @@
      bottom="244"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="RollScale"
-     width="94">
+     width="140">
         Roll Scale
     </text>
     <spinner
@@ -481,7 +481,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      max_val="1024"
      min_val="-1024"
      name="BuildAxisScale3"
@@ -492,7 +492,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale3"
@@ -503,9 +503,9 @@
      bottom="274"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="XDeadZone"
-     width="94">
+     width="140">
         X Dead Zone
     </text>
     <spinner
@@ -515,7 +515,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone1"
      width="56" />
     <spinner
@@ -525,7 +525,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone1"
      width="56" />
     <spinner
@@ -535,7 +535,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone1"
      width="56" />
     <text
@@ -544,9 +544,9 @@
      bottom="294"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YDeadZone"
-     width="94">
+     width="140">
         Y Dead Zone
     </text>
     <spinner
@@ -556,7 +556,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone2"
      width="56" />
     <spinner
@@ -566,7 +566,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone2"
      width="56" />
     <spinner
@@ -576,7 +576,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone2"
      width="56" />
     <text
@@ -585,9 +585,9 @@
      bottom="314"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZDeadZone"
-     width="94">
+     width="140">
         Z Dead Zone
     </text>
     <spinner
@@ -597,7 +597,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone0"
      width="56" />
     <spinner
@@ -607,7 +607,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone0"
      width="56" />
     <spinner
@@ -617,7 +617,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone0"
      width="56" />
     <text
@@ -626,9 +626,9 @@
      bottom="334"
      halign="right"
      layout="topleft"
-     left="20"
+     left="2"
      name="PitchDeadZone"
-     width="94">
+     width="140">
         Pitch Dead Zone
     </text>
     <spinner
@@ -638,7 +638,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone4"
      width="56" />
     <spinner
@@ -648,7 +648,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone4"
      width="56" />
     <spinner
@@ -658,7 +658,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone4"
      width="56" />
     <text
@@ -667,9 +667,9 @@
      bottom="354"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="YawDeadZone"
-     width="94">
+     width="140">
         Yaw Dead Zone
     </text>
     <spinner
@@ -679,7 +679,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="125"
+     left="150"
      name="AvatarAxisDeadZone5"
      width="56" />
     <spinner
@@ -689,7 +689,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone5"
      width="56" />
     <spinner
@@ -699,7 +699,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone5"
      width="56" />
     <text
@@ -708,9 +708,9 @@
      bottom="374"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="RollDeadZone"
-     width="94">
+     width="140">
         Roll Dead Zone
     </text>
     <spinner
@@ -720,7 +720,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="195"
+     left="220"
      name="BuildAxisDeadZone3"
      width="56" />
     <spinner
@@ -730,7 +730,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone3"
      width="56" />
     <text
@@ -739,9 +739,9 @@
      bottom="402"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="Feathering"
-     width="94">
+     width="140">
         Feathering
     </text>
     <slider
@@ -752,7 +752,7 @@
      increment="1"
      initial_value="0.7"
      layout="topleft"
-     left="116"
+     left="141"
      max_val="32"
      min_val="1"
      name="AvatarFeathering"
@@ -795,9 +795,9 @@
      bottom="430"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZoomScale2"
-     width="94">
+     width="140">
         Zoom Scale
     </text>
     <spinner
@@ -806,7 +806,7 @@
      decimal_digits="2"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      max_val="1024"
      min_val="-1024"
      name="FlycamAxisScale6"
@@ -817,9 +817,9 @@
      bottom="450"
      halign="right"
      layout="topleft"
-     left="20"
+     left="3"
      name="ZoomDeadZone"
-     width="96">
+     width="140">
         Zoom Dead Zone
     </text>
     <spinner
@@ -829,7 +829,7 @@
      increment="0.01"
      label_width="0"
      layout="topleft"
-     left="265"
+     left="290"
      name="FlycamAxisDeadZone6"
      width="56" />
     <button
@@ -837,10 +837,10 @@
      height="22"
      label="SpaceNavigator Defaults"
      layout="topleft"
-     left="340"
+     left="359"
      name="SpaceNavigatorDefaults"
      top="429"
-     width="184" />
+     width="200" />
     <button
      follows="right|bottom"
      height="20"
@@ -850,7 +850,7 @@
      left_delta="0"
      name="ok_btn"
      top_pad="9"
-     width="90" />
+     width="98" />
     <button
      follows="right|bottom"
      height="20"
@@ -860,5 +860,5 @@
      left_pad="4"
      name="cancel_btn"
      top_delta="0"
-     width="90" />
+     width="98" />
 </floater>
-- 
cgit v1.2.3


From 079963c9295243c731916127e39bfa39ae9690ca Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 14 Apr 2010 13:18:40 +0300
Subject: Fixed normal bug EXT-6302 (TP requests need to display destination
 region maturity) Added:  - parsing of region information from "lure" binary
 bucket  - displaying destination region maturity by teleport offer Reviewed
 by Mike Antipov at https://codereview.productengine.com/secondlife/r/229/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ee4e13f3c..6c9564c8cf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5165,7 +5165,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
-[MESSAGE]
+[MESSAGE], ([MATURITY])
     <form name="form">
       <button
        index="0"
-- 
cgit v1.2.3


From c1662e55838b6bde176a862847f67359ce0af3b4 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 14 Apr 2010 16:17:17 +0300
Subject: Fixed EXT-6591(normal) - Place profile accordions should be
 single-instance Made accordion single expansion - added single_expansion
 attribute

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_place_profile.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_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index a43b244fa0..9725e9952a 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -321,6 +321,7 @@
              follows="all"
              height="223"
              layout="topleft"
+             single_expansion="true"
              left="0"
              name="advanced_info_accordion"
              top_pad="10"
-- 
cgit v1.2.3


From 255ca59f7438a1528dff04e5facec2229bd9e10a Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 14 Apr 2010 16:18:33 +0300
Subject: Fixed EXT-6604(normal) - Nav bar search field text not vertically
 aligned Increased search field height to match location input height.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_navigation_bar.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_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 7ec1ca2e2e..96c76576c0 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -119,7 +119,7 @@
 	     commit_on_focus_lost="false"
 	     follows="right|top"
 	     halign="right"
-	     height="22"
+	     height="23"
 	     label="Search"
 	     layout="topleft"
 	     right="-10"
-- 
cgit v1.2.3


From e7bbdb039bd478c0baf60b0563a0455d11eccf48 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 14 Apr 2010 17:22:28 -0700
Subject: VWR-18603 en_xui_change for ES (longest); JA linguistic

---
 indra/newview/skins/default/xui/en/floater_world_map.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_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 291f8f6f51..233ab2c1b2 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -496,7 +496,7 @@
      top_delta="-1"
      name="DoSearch"
      tool_tip="Search for region"
-     width="58">
+     width="62">
 		<button.commit_callback
 		function="WMap.Location" />
     </button>
-- 
cgit v1.2.3


From c0ad2a55bac2f974876432f7e8ec11cc9d1b05a6 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 16 Apr 2010 09:14:45 +0300
Subject: Fixed EXT-6862(normal) - Offer Teleport button is offset to far to
 the right Reverted Eli's fix 11355 : a55a8ed85023 (VWR-17833 en_xui_change to
 cover PT (logest translation)) Fixed buttons width in Friends tab in Polish
 localization. Also fixed group tab buttons.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 233137a76b..8131b75b70 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -477,7 +477,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          label="Share"
          layout="topleft"
          name="share_btn"
-         width="85" />
+         width="62" />
         <button
          follows="bottom|left"
          left_pad="3"
-- 
cgit v1.2.3


From 960eb2c65fe5618bf977b80a3485a4346d5d85c6 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 16 Apr 2010 12:52:26 +0300
Subject: Fixed low bug EXT-6825 (The border for context menu for Groups tab is
 invisible and is merged with the background) - allowed to drop shadow.
 Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/248/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_people_groups.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/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index afa680139d..8f89d37dbb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
   <menu_item_call
    label="View Info"
    name="View Info">
-- 
cgit v1.2.3


From 9d85f4ebe99ea511b032622de7499e81fd93fbd6 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 16 Apr 2010 17:24:50 +0300
Subject: Fixed normal EXT-6812 ([TRUNCATION] APARIENCIA window > Forma > Boca
 > Labios: prominec. \"Labios: prominenc\" should be \"Labios: prominencia\".)

- There was two reasons:
1. Uninitialized variable in llsliderctrl.(h/cpp) that contains label size. This variable take part in calculation of TextBox size of label.
2. Font of 'label string' and text box was different. This causes wrong calculation of 'label string' length.

Reviwed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/246/

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 8042563900..19eb4bb0d6 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -110,7 +110,6 @@
      increment="1"
      initial_value="0"
      label="[DESC]"
-     label_width="100"
      layout="bottom|left"
      left="6"
      max_val="100"
-- 
cgit v1.2.3


From df65685f7334fb66f1b70f7babd48100a04d1f07 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 16 Apr 2010 17:27:45 +0300
Subject: Fixed EXT-6790(major) - Limit to amount of text output to script
 error/warning window is to limited. Could not find history for
 floater_script_debug_panel.xml. Looks like current max_length="10000" was
 randomly picked as a reasonable value at some point of viewer-2-0
 development. Using viewer-1-23 value for max_length - "2147483647"

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_script_debug_panel.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_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index bd9925be1d..e94af2c8d5 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -15,7 +15,7 @@
      follows="left|top|right|bottom"
      height="176"
      layout="topleft"
-     max_length="10000"
+     max_length="2147483647"
      name="Chat History Editor"
      parse_highlights="true" 
      width="420"
-- 
cgit v1.2.3


From 35168862f5ecc06166fbd1a9bcd601ae2abbf75b Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 16 Apr 2010 12:28:54 -0400
Subject: EXT-6892 : Add debug setting to show avatar rez times

This pops up a notification whenever another avatar rezzes.  Controlled by a #define, currently set to ON.
---
 indra/newview/skins/default/xui/en/notifications.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6c9564c8cf..ca922bf724 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5968,6 +5968,12 @@ The button will be shown when there is enough space for it.
 Drag items from inventory onto a person in the resident picker
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezNotification"
+   type="notifytip">
+Avatar '[NAME]' rezzed in [TIME] seconds.
+  </notification>
 
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
-- 
cgit v1.2.3


From b42efcfee36640fbded3c4116f8756e941b20d13 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 19 Apr 2010 13:00:12 +0300
Subject: Update for major task EXT-6564 - Fix wearable editing panels. Added
 temporary "edit" button to outfit list to allow QA test new wearable edit
 panels. Was not reviewed.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 9ece4aead8..6fbb3229ac 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -154,6 +154,16 @@
                  sort_column="look_item_sort"
                  name="look_item_sort" />
             </scroll_list>
+			<!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)-->
+				<button
+				  follows="left|top|right"
+				  height="20"
+				  label="edit"
+				  left="0"
+				  top="0"
+				  layout="topleft"
+				  name="edit_wearable_btn"
+				  width="40" />
 
             <panel
              background_visible="true"
-- 
cgit v1.2.3


From 71c7b2f6d76b29c527d07c01c52127bf4f5b402e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 19 Apr 2010 13:23:24 +0300
Subject: completed EXT-6764 Implement filtering of wearables (combobox
 options: Clothes/Body, Objects, All) on Add to Outfit subpanel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/221/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 93 ++++++++++++++++++----
 1 file changed, 76 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 6fbb3229ac..bc37af0319 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -25,6 +25,10 @@
 		(unknown)
 	</panel.string>
 
+    <!-- Wearables filtering strings -->
+    <string name="Filter.All" value="All"/>
+    <string name="Filter.Clothes/Body" value="Clothes/Body"/>
+    <string name="Filter.Objects" value="Objects"/>
 
     <button
      follows="top|left"
@@ -232,29 +236,18 @@
         <layout_panel
          auto_resize="true"
          default_tab_group="3"
-         height="250" 
-         min_height="120"
+         height="210" 
+         min_height="210"
          name="add_wearables_panel"
          width="300"
          tab_group="2"
          user_resize="true"
          visible="false">
 
-            <text
-             follows="top|left|right"
-             font="SansSerifBold"
-             height="13"
-             layout="topleft"
-             left="5"
-             name="status"
-             text_color="LtGray"
-             top="5"
-             value="Add Wearables"
-             use_ellipses="true"
-             width="275" />
-
+            <!-- *NOTE is not used, invisible and disabled -->
             <filter_editor
              background_image="TextField_Search_Off"
+             enabled="false"
              follows="left|top|right"
              font="SansSerif"
              label="Filter"
@@ -264,13 +257,79 @@
              height="20"
              name="look_item_filter"
              text_color="black"
-             text_pad_left="25" />
+             text_pad_left="25"
+             visible="false"/>
+
+            <layout_stack
+             animate="true"
+             follows="all"
+             height="25"
+             width="300"
+             layout="topleft"
+             orientation="horizontal"
+             name="filter_panels"
+             top="0"
+             left="0">
+                <layout_panel
+                 layout="topleft"
+                 follows="left|top|right"
+                 height="25"
+                 label="IM Control Panel"
+                 name="filter_button_panel"
+                 width="150"
+                 auto_resize="true"
+                 user_resize="false">
+                    <text
+                     follows="top|left|right"
+                     font="SansSerifBold"
+                     height="13"
+                     layout="topleft"
+                     left="5"
+                     name="add_to_outfit_label"
+                     text_color="LtGray"
+                     top="3"
+                     value="Add to Outfit:"
+                     use_ellipses="true"
+                     width="270" />
+                    <button
+                     follows="top|right"
+                     height="20"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay=""
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     is_toggle="true"
+                     label="O"
+                     layout="topleft"
+                     right="-1"
+                     name="filter_button"
+                     top="3"
+                     width="20" />
+                </layout_panel>
+                <layout_panel
+                 auto_resize="true"
+                 height="25"
+                 min_width="130"
+                 name="filter_combobox_panel"
+                 width="150"
+                 user_resize="false"
+                 visible="false">
+                    <combo_box
+                     follows="top|left|right"
+                     height="20"
+                     layout="topleft"
+                     right="-5"
+                     name="filter_wearables_combobox"
+                     top="0"
+                     width="130"/>
+                </layout_panel>
+            </layout_stack>
 
             <inventory_panel
              allow_multi_select="false"
              border="false"
              follows="left|top|right|bottom"
-             height="176"
+             height="155"
              layout="topleft"
              left="0"
              mouse_opaque="false"
-- 
cgit v1.2.3


From a16195fb81d7f4c7a5dd60f91d067bbdcac0f44d Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 15:50:45 +0300
Subject: Fixed normal bug EXT-6864 (Resident-related menu items are
 enabled/displayed for PSTN bridge callers)

* Disabled all currently processed menu items related to interaction with a resident for Avaline callers.
* Added enable callback for View Profile menu item to disable it for Avaline callers.
* Disabled menu items related to text chat.
Full list is:
 - View Profile
 - Add Friend
 - IM
 - Call
 - Share
 - Pay
 - Block Text
 - Moderate Options:
  -- Allow Text chat

DEV notes: To process moderation options separate "on_enable handler" was created for group moderate actions.

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

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

(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 59c7f4ed85..2515b60868 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -30,6 +30,9 @@
      name="View Profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_view_profile" />
     </menu_item_call>
     <menu_item_call
      label="Add Friend"
@@ -153,7 +156,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -164,7 +167,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -175,7 +178,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -186,7 +189,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     </context_menu>
-- 
cgit v1.2.3


From a94ec45cb18f262e9cb9277960c450d84479757b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 16:06:23 +0300
Subject: Fixed normal bug EXT-6896 (String changes to default help text in
 Friends, Nearby and Recent lists)

* Updated default help text in Friends, Nearby and Recent lists according to requirements in the ticket.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8131b75b70..43175c8509 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -13,10 +13,10 @@
  width="333">
     <string
      name="no_people"
-     value="No people" />
+     value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_one_near"
-     value="No one near" />
+     value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -264,8 +264,8 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
-If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
+                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
              </text>
         </panel>
         <panel
-- 
cgit v1.2.3


From eddb964e701d43e6d5135fd82e8c065a43e4a0e5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 16:20:11 +0300
Subject: Fixed windows EOLs.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 43175c8509..7330eded4c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -264,7 +264,7 @@
              top="10"
              width="293"
              wrap="true">
-                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
 Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
              </text>
         </panel>
-- 
cgit v1.2.3


From d57e8ecc7e119ca6930499ee270f438fc5ec415a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 19 Apr 2010 17:21:16 +0300
Subject: fixed EXT-6848 Avoid creation of dummy objects in LLOnlineStatusToast
 and LLPanelGenericTip classes. * decoupled tip toast panel related logic from
 class LLTast; * moved documentation comment of  LLPanelGenericTip constructor
 from .cpp to .h file; * corrected name attribute in panel_generic_tip.xml;

reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/230/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_generic_tip.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_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
index 453ed7c7a6..eea92895f5 100644
--- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
@@ -3,7 +3,7 @@
  height="40"
  layout="topleft"
  left="0"
- name="panel_system_tip"
+ name="panel_generic_tip"
  top="0"
  width="305">
     <text
-- 
cgit v1.2.3


From 2e062a8ecbdd02d85a99d9a0e60ec488a25f7dce Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 17:26:14 +0300
Subject: Fixed normal bug EXT-6899 (String changes to default and null results
 Groups List help text)

* Updated help texts in Groups List according to requirements in the ticket.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7330eded4c..8a4a28e188 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -35,10 +35,10 @@
      -->
     <string
      name="no_filtered_groups_msg"
-     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/groups Search]." />
     <string
      name="no_groups_msg"
-     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
+     value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." />
     <filter_editor
      follows="left|top|right"
      height="23"
-- 
cgit v1.2.3


From d88a465a46a3e8cb988e0122cf748882cae367b8 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 19 Apr 2010 17:56:09 +0300
Subject: Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs
 to be: yyyy/mm/dd for Japanese).

- Made avatar registration date localizeable.
- Specified localization templates for English, Japanese and German.

Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++++
 1 file changed, 4 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 813f59ff89..df4e4153f4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3103,4 +3103,8 @@ Abuse Report</string>
   <string name="New Script">New Script</string>
   <string name="New Folder">New Folder</string>
   <string name="Contents">Contents</string>
+
+  <!-- birth date format shared by avatar inspector and profile panels -->
+  <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
+
 </strings>
-- 
cgit v1.2.3


From 300651e2c80b1d4fc3498758f65a1d0e8eb59934 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 19 Apr 2010 19:19:29 +0300
Subject: Fixed bug EXT-6852 ([STRING IN EN] Media settings : Owner, Group, and
 Anyone).

Added names to nameless textboxes.
Trivial change, not reviewed.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_media_settings_permissions.xml    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
index b5c2371510..c5f44cd049 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
@@ -42,10 +42,11 @@
 
   <text 
    bottom_delta="-50" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="owner_label">
     Owner
   </text>
   
@@ -79,10 +80,11 @@
 
   <text 
    bottom_delta="-36" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="group_label">
     Group:
   </text>
   
@@ -126,10 +128,11 @@
 
   <text 
    bottom_delta="-36" 
+   enabled="false"
    follows="top|left" 
    height="15" 
    left="10" 
-   enabled="false">
+   name="anyone_label">
     Anyone
   </text>
   
-- 
cgit v1.2.3


From c3fa45282f5bdb0cb7a3fcd680154e88cafde4bb Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Mon, 19 Apr 2010 17:19:35 -0700
Subject: Fix for EXT-6925 (Mime type association missing for video/*
 wildcard).

In mime_types*.xml, added <impl> sections to the mimetype entries for video/* and audio/* which point to the quicktime plugin on Mac/Windows and gstreamer on Linux.

Reviewed by Callum at http://codereview.lindenlab.com/1252035
---
 indra/newview/skins/default/xui/en/mime_types.xml       | 6 ++++++
 indra/newview/skins/default/xui/en/mime_types_linux.xml | 6 ++++++
 indra/newview/skins/default/xui/en/mime_types_mac.xml   | 6 ++++++
 3 files changed, 18 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index 76c0d027f3..8e1e5ff062 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -138,6 +138,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
@@ -146,6 +149,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 05cd850725..4748c14554 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -138,6 +138,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
@@ -146,6 +149,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 76c0d027f3..8e1e5ff062 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -138,6 +138,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
@@ -146,6 +149,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-- 
cgit v1.2.3


From 8b0c0260078ba90ae30997c0aebcbc0ce45336f0 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 20 Apr 2010 07:44:33 +0300
Subject: Fixed normal bug EXT-6801 (EXT-6801 ([TRUNCATION] multiple langs. Me
 > preferences > graphic > advanced))

- Made labels of sliders wider
- Increased distance between radio groups

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

--HG--
branch : product-engine
---
 .../default/xui/en/panel_preferences_graphics1.xml | 61 ++++++++++------------
 1 file changed, 28 insertions(+), 33 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 7ab74855a5..0a56f711dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -332,21 +332,21 @@
 		increment="8"
 		initial_value="160"
 		label="Draw distance:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
-		left="216"
+		left="200"
 		max_val="512"
 		min_val="64"
 		name="DrawDistance"
 		top="3"
-		width="255" />
+		width="296" />
 		<text
 		type="string"
 		length="1"
 		follows="left|top"
 		height="12"
 		layout="topleft"
-		left_delta="250"
+		left_delta="291"
 		name="DrawDistanceMeterText2"
 		top_delta="0"
 		width="128">
@@ -360,13 +360,13 @@
 		increment="256"
 		initial_value="4096"
 		label="Max. particle count:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
-		left="216"
+		left="200"
 		max_val="8192"
 		name="MaxParticleCount"
 		top_pad="7"
-		width="262" />
+		width="303" />
 		<slider
 		control_name="RenderGlowResolutionPow"
 		decimal_digits="0"
@@ -375,7 +375,7 @@
 		increment="1"
 		initial_value="8"
 		label="Post process quality:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		max_val="9"
@@ -383,7 +383,7 @@
 		name="RenderPostProcess"
 		show_text="false"
 		top_pad="4"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="PostProcessText" />
@@ -407,14 +407,14 @@
 		increment="0.125"
 		initial_value="160"
 		label="  Objects:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		max_val="2"
 		name="ObjectMeshDetail"
 		show_text="false"
 		top_pad="6"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="ObjectMeshDetailText" />
@@ -425,13 +425,13 @@
 		height="16"
 		initial_value="160"
 		label="  Flexiprims:"
-		label_width="140"
+		label_width="185"
 		layout="topleft"
 		left_delta="0"
 		name="FlexibleMeshDetail"
 		show_text="false"
 		top_pad="4"
-		width="223">
+		width="264">
 			<slider.commit_callback
 			function="Pref.UpdateSliderText"
 			parameter="FlexibleMeshDetailText" />
@@ -443,13 +443,13 @@
         increment="0.125"
         initial_value="160"
         label="  Trees:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         name="TreeMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="TreeMeshDetailText" />
@@ -461,13 +461,13 @@
         increment="0.125"
         initial_value="160"
         label="  Avatars:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         name="AvatarMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="AvatarMeshDetailText" />
@@ -479,7 +479,7 @@
         increment="0.125"
         initial_value="160"
         label="  Terrain:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         max_val="2"
@@ -487,7 +487,7 @@
         name="TerrainMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="TerrainMeshDetailText" />
@@ -501,7 +501,7 @@
         increment="8"
         initial_value="160"
         label="  Sky:"
-        label_width="140"
+        label_width="185"
         layout="topleft"
         left_delta="0"
         max_val="128"
@@ -509,7 +509,7 @@
         name="SkyMeshDetail"
         show_text="false"
         top_pad="4"
-        width="223">
+        width="264">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="SkyMeshDetailText" />
@@ -520,7 +520,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="444"
+        left="469"
         name="PostProcessText"
         top="305"
         width="128">
@@ -605,7 +605,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left_delta="-230"
+        left="200"
         name="LightingDetailText"
         top_pad="8"
         width="140">
@@ -616,15 +616,13 @@
         draw_border="false"
         height="38"
         layout="topleft"
-        left_delta="0"
         name="LightingDetailRadio"
         top_pad="5"
-        width="321">
+        width="200">
            <radio_item
             height="16"
             label="Sun and moon only"
             layout="topleft"
-            left="3"
             name="SunMoon"
             value="0"
             top="3"
@@ -633,7 +631,6 @@
             height="16"
             label="Nearby local lights"
             layout="topleft"
-            left_delta="0"
             name="LocalLights"
             value="1"
             top_delta="16"
@@ -645,7 +642,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="358"
+        left_pad="-30"
         name="TerrainDetailText"
         top="465"
         width="155">
@@ -659,23 +656,21 @@
         left_delta="0"
         name="TerrainDetailRadio"
         top_pad="5"
-        width="321">
+        width="70">
            <radio_item
             height="16"
             label="Low"
             layout="topleft"
-            left="3"
             name="0"
             top="3"
-            width="315" />
+            width="50" />
            <radio_item
             height="16"
             label="High"
             layout="topleft"
-            left_delta="0"
             name="2"
             top_delta="16"
-            width="315" />
+            width="50" />
         </radio_group>
 	</panel>
 	
-- 
cgit v1.2.3


From 74ec5c6622ef8cb7595f572834d243e927b644d9 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 20 Apr 2010 07:46:38 +0300
Subject: =?UTF-8?q?Fixed=20normal=20EXT-6729=20([TRUNCATION]=20SELECTOR=20?=
 =?UTF-8?q?DE=20COLOR.=20\"(arr=C3=A1stralo=20abajo=20para=20g\"=20should?=
 =?UTF-8?q?=20be=20\"(arr=C3=A1stralo=20abajo=20para=20guardarlo)\"=20or..?=
 =?UTF-8?q?.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Applied word wrap

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_color_picker.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/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index 2fa112af8c..421f3a72c6 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -213,7 +213,8 @@
      left="10"
      name="(Drag below to save.)"
      top_pad="66"
-     width="130">
+     width="130"
+     wrap="true">
         (Drag below to save)
     </text>
 </floater>
-- 
cgit v1.2.3


From 861f8641f8c893cd8111e45155ea984c51dd87aa Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 20 Apr 2010 07:48:40 +0300
Subject: =?UTF-8?q?Fixed=20normal=20bug=20EXT-6817=20([TRUNCATION]=20Mundo?=
 =?UTF-8?q?=20>=20Perfil=20del=20lugar=20>=20Region/Estate=20>=20REGI?=
 =?UTF-8?q?=C3=93N/ESTADO=20>=20Estado.=20txt=20overlap=20the=20nexts=20wi?=
 =?UTF-8?q?ndows.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Increased panel and view_border size, moved name_lists to the right

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_region_estate.xml   | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(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 9186efc431..08e36d5e57 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,14 +2,14 @@
 <panel
  border="false"
  follows="top|left"
- height="320"
+ height="510"
  help_topic="panel_region_estate_tab"
  label="Estate"
  layout="topleft"
  left="0"
  name="Estate"
  top="320"
- width="480">
+ width="530">
     <text
      type="string"
      length="1"
@@ -20,7 +20,7 @@
      name="estate_help_text"
      top="14"
      word_wrap="true"
-     width="250">
+     width="300">
         Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
@@ -82,7 +82,7 @@
      layout="topleft"
      left_delta="-4"
      top_pad="5"
-     width="250" />
+     width="300" />
     <check_box
      height="20"
      label="Use Global Time"
@@ -184,14 +184,14 @@
      layout="topleft"
      name="apply_btn"
      top_pad="10"
-     left="78"
+     left="110"
      width="97" />
     <button
      follows="left|top"
      height="23"
      label="Send Message To Estate..."
      layout="topleft"
-     left="20"
+     left="45"
      name="message_estate_btn"
      top_pad="20"
      width="220" />
@@ -200,7 +200,7 @@
      height="23"
      label="Kick Resident from Estate..."
      layout="topleft"
-     left="20"
+     left="45"
      name="kick_user_from_estate_btn"
      top_pad="5"
      width="220" />
@@ -213,7 +213,7 @@
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="470"
+     right="520"
      width="200">
         Estate Managers:
     </text>
@@ -222,7 +222,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -240,7 +240,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_estate_manager_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -269,7 +269,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -287,7 +287,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_allowed_avatar_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -316,7 +316,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -334,7 +334,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_allowed_group_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
@@ -363,7 +363,7 @@
      follows="top|left"
      height="71"
      layout="topleft"
-     right="470"
+     right="520"
      top_pad="-5"
      width="200" />
     <name_list
@@ -381,7 +381,7 @@
      label="Remove..."
      layout="topleft"
      name="remove_banned_avatar_btn"
-     right="470"
+     right="520"
      top_pad="5"
      width="97" />
     <button
-- 
cgit v1.2.3


From 53e4718a460f3d0c421d93296d35974f95bc77fb Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 20 Apr 2010 07:51:34 +0300
Subject: =?UTF-8?q?Fixed=20normal=20bug=20EXT-6837=20([TRUNCATION]=20Mundo?=
 =?UTF-8?q?=20>=20Sol=20>=20Editor=20del=20entorno=20>=20Cielo=20avanzado?=
 =?UTF-8?q?=20>=20Editor=20del=20ciclo=20de=20un=20d=C3=ADa.=20\"Configura?=
 =?UTF-8?q?ci=C3=B3n=20del=20fotograma=20clav\"=20should=20be=20\"Configur?=
 =?UTF-8?q?aci=C3=B3n=20del=20fotograma=20clave\".)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Some redesign of floater_day_cycle.
- Main changes:
    increased view_border size;
    moved controls to the right of increased view_border to the right;
    increased spinner width to see all its content;
    moved 'Play' and 'Stop!' buttons in one row with 'Use estate time' button.

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

--HG--
branch : product-engine
---
 .../default/xui/en/floater_day_cycle_options.xml   | 59 +++++++++++-----------
 1 file changed, 30 insertions(+), 29 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 2c0c8d45b3..42a9ff551e 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -7,7 +7,7 @@
  help_topic="day_cycle_floater"
  save_rect="true"
  title="DAY CYCLE EDITOR"
- width="646">
+ width="658">
     <tab_container
      follows="left|top"
      height="255"
@@ -16,7 +16,7 @@
      name="Day Cycle Tabs"
      tab_position="top"
      top="20"
-     width="644">
+     width="656">
         <panel
          border="true"
          follows="left|top|right|bottom"
@@ -27,7 +27,7 @@
          mouse_opaque="false"
          name="Day Cycle"
          top="0"
-         width="642">
+         width="654">
             <multi_slider
              can_edit_text="true"
              control_name="WLTimeSlider"
@@ -313,7 +313,7 @@
              left="555"
              name="WLAddKey"
              top="30"
-             width="80" />
+             width="96" />
             <button
              height="20"
              label="Delete Key"
@@ -322,7 +322,7 @@
              left_delta="0"
              name="WLDeleteKey"
              top_pad="5"
-             width="80" />
+             width="96" />
             <text
              type="string"
              length="1"
@@ -348,7 +348,7 @@
              left="30"
              name="WLCurKeyTimeText"
              top="124"
-             width="100">
+             width="105">
                 Key Time:
             </text>
             <spinner
@@ -361,11 +361,11 @@
              label="Hour"
              label_width="30"
              layout="topleft"
-             left_delta="0"
+             left_delta="25"
              max_val="100"
              name="WLCurKeyHour"
              top_pad="4"
-             width="70" />
+             width="74" />
             <spinner
              control_name="WLCurKeyMin"
              decimal_digits="0"
@@ -402,7 +402,7 @@
              left_delta="0"
              name="WLKeyPresets"
              top_pad="7"
-             width="155" />
+             width="205" />
             <view_border
              bevel_style="none"
              follows="top|left"
@@ -410,7 +410,7 @@
              layout="topleft"
              left="12"
              top="101"
-             width="190" />
+             width="240" />
             <text
              type="string"
              length="1"
@@ -419,7 +419,7 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="220"
+             left_pad="15"
              name="DayCycleText"
              top="114"
              width="120">
@@ -444,7 +444,7 @@
              layout="topleft"
              left_delta="0"
              name="DayCycleText2"
-             top_pad="9"
+             top_pad="17"
              width="120">
                 Length of Cycle:
             </text>
@@ -462,7 +462,7 @@
              max_val="100"
              name="WLLengthOfDayHour"
              top_pad="4"
-             width="70" />
+             width="74" />
             <spinner
              control_name="WLLengthOfDayMin"
              decimal_digits="0"
@@ -492,57 +492,58 @@
              max_val="59"
              name="WLLengthOfDaySec"
              top_delta="0"
-             width="60" />
+             width="60"/>
             <text
              type="string"
+             halign="right"
              length="1"
              border_visible="true"
              follows="left|top|right"
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="310"
+             left_delta="-23"
              name="DayCycleText3"
              top="114"
-             width="120">
-                Preview:
+             width="85">
+                Preview :
             </text>
             <button
              height="20"
              label="Play"
              label_selected="Play"
              layout="topleft"
-             left_delta="60"
+             left="480"
              name="WLAnimSky"
              top_pad="5"
-             width="50" />
+             width="83" />
             <button
              height="20"
              label="Stop!"
              label_selected="Stop"
              layout="topleft"
-             left_pad="5"
+             left_pad="4"
              name="WLStopAnimSky"
              top_delta="0"
-             width="50" />
+             width="83" />
             <button
              height="20"
              label="Use Estate Time"
              label_selected="Go to Estate Time"
              layout="topleft"
-             left_pad="5"
+             left="480"
              name="WLUseLindenTime"
-             top_delta="0"
-             width="150" />
+             top_pad="9"
+             width="170" />
             <button
              height="20"
              label="Save Test Day"
              label_selected="Save Test Day"
              layout="topleft"
-             left="480"
+             left_delta="0"
              name="WLSaveDayCycle"
-             top="175"
-             width="150" />
+             top_pad="9"
+             width="170" />
             <button
              height="20"
              label="Load Test Day"
@@ -550,8 +551,8 @@
              layout="topleft"
              left_delta="0"
              name="WLLoadDayCycle"
-             top_pad="5"
-             width="150" />
+             top_pad="3"
+             width="170" />
         </panel>
     </tab_container>
 </floater>
-- 
cgit v1.2.3


From 1ce1e7f9a121cad473c84fced770837da9e6e55c Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 20 Apr 2010 11:11:33 +0300
Subject: Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none
 needs to be localized Added "DefaultMimeType" string to strings.xml to make
 "none/none" mime type localizable. Replaced all occurrences of "none/none"
 string with call to static method.

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

--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 df4e4153f4..a480266b5a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3106,5 +3106,7 @@ Abuse Report</string>
 
   <!-- birth date format shared by avatar inspector and profile panels -->
   <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
+  
+  <string name="DefaultMimeType">none/none</string>
 
-</strings>
+  </strings>
-- 
cgit v1.2.3


From f260d52c75ee9b0d3c6fc1b081b6ae0d19641f9e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 20 Apr 2010 13:46:43 +0300
Subject: Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is
 broken. NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing
 panels) for more info. Fix info: - Moved edit wearable button to place where
 it does not break widget paddings. - Updated code that calculates button
 position. - Sending button to front to ensure it is clickable and visible.

Not reviewed.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index bc37af0319..c77e4e8d5e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -30,6 +30,20 @@
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
 
+  <!-- 
+  TODO remove this button. Added it temporary for QA to be able to test new edit wearable 
+  panel (see EXT-6564)
+  -->
+				<button
+				  follows="left|top|right"
+				  height="20"
+				  label="edit"
+				  left="0"
+				  top="0"
+				  layout="topleft"
+				  name="edit_wearable_btn"
+				  width="40" /> 
+  
     <button
      follows="top|left"
      height="23"
@@ -158,18 +172,8 @@
                  sort_column="look_item_sort"
                  name="look_item_sort" />
             </scroll_list>
-			<!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)-->
-				<button
-				  follows="left|top|right"
-				  height="20"
-				  label="edit"
-				  left="0"
-				  top="0"
-				  layout="topleft"
-				  name="edit_wearable_btn"
-				  width="40" />
 
-            <panel
+          <panel
              background_visible="true"
              bevel_style="none"
              follows="bottom|left|right"
-- 
cgit v1.2.3


From 6ed8c492f5301ec6125f6d57127481c38dd403dc Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 20 Apr 2010 15:47:02 +0300
Subject: fix for EXT-4082 Normal Uploading huge image crashes viewer
 https://codereview.productengine.com/secondlife/r/11/ reviewed Tofu Linden

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 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 df4e4153f4..3936a0b0cf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3107,4 +3107,6 @@ Abuse Report</string>
   <!-- birth date format shared by avatar inspector and profile panels -->
   <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
 
+  <string name="texture_load_dimensions_error">Can't load images larger then [WIDTH]*[HEIGHT]</string>
+
 </strings>
-- 
cgit v1.2.3


From a3eab973874b068cf74cf722403b7f618d35d929 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 20 Apr 2010 16:06:39 +0300
Subject: fix for EXT-6037 Nearby Speakers floater does not remember size and
 position on relogging https://codereview.productengine.com/secondlife/r/270/
 reviewed mantipov

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 114b9a84e3..5b77f11d71 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -10,7 +10,9 @@
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
  title="Voice Controls"
+ save_dock_state="true"
  save_visibility="true"
+ save_rect="true"
  single_instance="true"
  width="282">
     <string
-- 
cgit v1.2.3


From 5acf8a5f13e064fcfb5d8fbd42e631a18244a674 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 20 Apr 2010 16:52:32 +0300
Subject: Fixed normal bug EXT-6807(Object's chicklet shows context menu for
 bottom bar)  - moved the common code (menu stuff handling) from
 LLIMP2PChiclet, LLAdHocChiclet, LLIMGroupChiclet to their parent LLIMChiclet 
 - added popup menus to LLInvOfferChiclet and LLScriptChiclet (notice that
 just the closing menu item was added because these chiclets are not connected
 with IM sessions.) Reviewed by Mike Antipov at
 https://codereview.productengine.com/secondlife/r/254/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_inv_offer_chiclet.xml   | 19 +++++++++++++++++++
 .../skins/default/xui/en/menu_script_chiclet.xml      | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_script_chiclet.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
new file mode 100644
index 0000000000..45a0a6635b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="InvOfferChiclet Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="Close"
+     layout="topleft"
+     name="Close">
+        <menu_item_call.on_click
+         function="InvOfferChiclet.Action"
+         parameter="end" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
new file mode 100644
index 0000000000..db29d9cebc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="ScriptChiclet Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="Close"
+     layout="topleft"
+     name="Close">
+        <menu_item_call.on_click
+         function="ScriptChiclet.Action"
+         parameter="end" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From 9d74b586b3ed34229c179be6f676aba65041812b Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 20 Apr 2010 17:16:27 +0300
Subject: fix after wrong merge for EXT-4082 - long string

--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 a480266b5a..2c6e6dbccb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3108,5 +3108,6 @@ Abuse Report</string>
   <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
   
   <string name="DefaultMimeType">none/none</string>
+  <string name="texture_load_dimensions_error">Can't load images larger then [WIDTH]*[HEIGHT]</string>
 
   </strings>
-- 
cgit v1.2.3


From eed51486aa27da1d299e9c93d285a7d10ff1e811 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 20 Apr 2010 17:41:16 +0300
Subject: no ticket/review fix typo

--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 2c6e6dbccb..8c4afc48e1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3108,6 +3108,6 @@ Abuse Report</string>
   <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
   
   <string name="DefaultMimeType">none/none</string>
-  <string name="texture_load_dimensions_error">Can't load images larger then [WIDTH]*[HEIGHT]</string>
+  <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
 
   </strings>
-- 
cgit v1.2.3


From 6c74c65e99abf7f76620771633d57241d3024f54 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 20 Apr 2010 18:50:04 +0300
Subject: Fixed bug EXT-6872 (Pop-up menu for hyperlink in 'Delete pick' dialog
 doesn't work).

Disabled links in the remove pick dialog.
This seems to be the simpliest solution and the same is done e.g. in the teleport confirmation dialog.
I'm not sure how to fix the drop-down menu.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/269/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ca922bf724..07304eb14e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -800,7 +800,7 @@ Insufficient funds to create classified.
    icon="alertmodal.tga"
    name="DeleteAvatarPick"
    type="alertmodal">
-Delete pick [PICK]?
+Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
-- 
cgit v1.2.3


From 242a5644a565ab2880908269e94451ae2fb649b2 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 20 Apr 2010 18:53:29 +0300
Subject: Fixed bug EXT-6603 (Nearby Chat watermark text needs more left
 padding).

Added text left padding: 5px.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/271/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_nearby_chat_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/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 1d99de1fa7..184ea54fcb 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -16,10 +16,11 @@
      label="Click here to chat."
      layout="topleft"
      left_delta="3"
-     text_pad_right="25"
      left="0"
      max_length="512"
      name="chat_box"
+     text_pad_left="5"
+     text_pad_right="25"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="2"
      width="283" />
-- 
cgit v1.2.3


From e047a050ba8724fb2555e48cbce759961d599461 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 20 Apr 2010 18:57:01 +0300
Subject: Fixed bug EXT-6881 ([FORMATTING] Acerca del terreno (About Land)
 window > Contrato tab. Space in blank needed).

Added a space after the colon, so the translatable string is now "Last Modified: ".

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/272/

--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 8c4afc48e1..80fddcba43 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2156,7 +2156,7 @@ Clears (deletes) the media and all params from the given face.
 	<!-- Region/Estate Covenant -->
 	<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>
 	<string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.</string>
-	<string name="covenant_last_modified">Last Modified:</string>
+	<string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space -->
 	<string name="none_text"  value=" (none) " />
 	<string name="never_text" value=" (never) " />
 
-- 
cgit v1.2.3


From b252c4555674be26c92da6e9a891ec12051e656d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 20 Apr 2010 17:06:23 -0700
Subject: EXT-6961 en_xui_change for IT ES PL

---
 indra/newview/skins/default/xui/en/panel_login.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_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 01adc00e1a..a725548e61 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -201,7 +201,7 @@ height="16"
 name="forgot_password_text"
 top_pad="12"
 right="-10"
-  width="210">
+  width="215">
        Forgot your name or password?
 </text>
 <text
@@ -213,7 +213,7 @@ height="16"
 name="login_help"
 top_pad="2"
 right="-10"
-    width="190">
+    width="220">
        Need help logging in?   </text>
 <!--  <text
     follows="right|bottom"
-- 
cgit v1.2.3


From 5ecd9db84555d431b03cde5fd6b5adb219175b34 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Wed, 21 Apr 2010 10:15:09 +0300
Subject: fix for EXT-6932 "Planning","Details", "Sales" tabs from Group
 profile are allowed to edit but changes can not be saved
 https://codereview.productengine.com/secondlife/r/281/ vsavchuk

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 7996a89e72..9e99a8ceaf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -262,6 +262,7 @@
          top="0"
          width="313">
             <text_editor
+             enabled="false"
              type="string"
              follows="all"
              height="200"
@@ -286,6 +287,7 @@
          top="0"
          width="313">
           <text_editor
+             enabled="false"
              type="string"
              follows="all"
              height="185"
@@ -329,6 +331,7 @@
          top="0"
          width="313">
             <text_editor
+             enabled="false"
              type="string"
              follows="all"
              height="185"
-- 
cgit v1.2.3


From 4395d8e9f1302e8efcda4b35da3b0e3ea6c36928 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 21 Apr 2010 10:17:09 +0300
Subject: WIP: critical bug EXT-4837 ([NUX] When filter results in null state,
 provide a message suggesting the user try global search.)

Partial implementation of help text in case of empty list when filtered for Nearby and Recent lists of People panel:
 * Extracted support implementation of several messages for empty list depend of filtering from LLGroupList to LLFlatListEx
 * change inheritence of LLGroupList and LLAvatarList from LLFlatListView to LLFlatListViewEx
 * updated panel people to init Nearby & Recent lists with appropriate messages.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8a4a28e188..61784fede4 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -12,11 +12,17 @@
  top="0"
  width="333">
     <string
-     name="no_people"
+     name="no_recent_people"
      value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+    <string
+     name="no_filtered_recent_people"
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." />
     <string
      name="no_one_near"
      value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+    <string
+     name="no_one_filtered_near"
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -30,7 +36,7 @@
      name="groups_filter_label"
      value="Filter Groups" />
      <!--
-     *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
+     *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
      They are not defined as translatable in VLT. See EXT-5931
      -->
     <string
-- 
cgit v1.2.3


From 94791f7b276fe4cb2bf6c488333c9e3eca3b9dee Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 21 Apr 2010 13:42:35 +0300
Subject: Fixed normal bug EXT-5220 (Remove Edit Appearance button from Me
 panel) - the button and respective code were removed. Reviewed by Vadim
 Savchuk at https://codereview.productengine.com/secondlife/r/283/.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 8 --------
 indra/newview/skins/default/xui/en/panel_profile.xml    | 8 --------
 2 files changed, 16 deletions(-)

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

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 5e41d65720..841a4f5713 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -401,14 +401,6 @@
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
          width="152" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Edit Appearance"
-         left_pad="3"
-         name="edit_appearance_btn"
-         tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         width="153" />
  </layout_panel>
 </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index a666608103..d7a601d7a3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -389,14 +389,6 @@
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
          width="130" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Edit Appearance"
-         left_pad="10"
-         name="edit_appearance_btn"
-         tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         width="130" />
         </layout_panel>
 
 </layout_stack>
-- 
cgit v1.2.3


From 6b722079c4207eeb96aef3305ed2538933b06358 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 21 Apr 2010 13:33:49 +0300
Subject: Fixed EXT-6883(normal) - [TRUNCATION] Friendship offer screen
 Increased IM control panel width by nine pixels to avoid truncation in all
 languages(longest are Spanish and German). Also updated IM floater width(by
 nine pixels) to avoid any possible truncation.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/252/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_im_container.xml  |  6 ++--
 .../skins/default/xui/en/floater_im_session.xml    | 10 +++---
 .../default/xui/en/panel_im_control_panel.xml      | 40 +++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 65a05f3ec5..ced8c29199 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -11,7 +11,7 @@
  save_visibility="true"
  single_instance="true"
  title="CONVERSATIONS"
- width="392">
+ width="396">
     <tab_container
      follows="left|right|top|bottom"
      height="390"
@@ -27,7 +27,7 @@
      halign="left"
      use_ellipses="true"
      top="0"
-     width="390" />
+     width="394" />
     <icon
      color="DefaultShadowLight"
      enabled="false"
@@ -38,5 +38,5 @@
      left="1"
      name="im_box_tab_container_icon"
      bottom="10"
-     width="390" />
+     width="394" />
 </multi_floater>
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 422e50f035..f537c81860 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="385"
+ width="394"
  can_resize="true"
  min_width="250"
  min_height="190">
@@ -22,7 +22,7 @@
    default_tab_group="2"
   follows="all"
   height="320"
-  width="385"
+  width="394"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
@@ -43,7 +43,7 @@
        tab_group="2"
        top="0"
        height="200"
-	     width="245"
+	     width="254"
        user_resize="true">
         <button
           height="20"
@@ -70,7 +70,7 @@
          parse_highlights="true"
          allow_html="true"
         left="1"
-         width="240">
+         width="249">
         </chat_history>
         <line_editor
          bottom="0"
@@ -81,7 +81,7 @@
          layout="bottomleft"
          name="chat_editor"
          tab_group="3"
-         width="240">
+         width="249">
         </line_editor>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 29c6a17c31..33a5e01e4c 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -3,14 +3,14 @@
  border="false"
  height="300"
  name="panel_im_control_panel"
- width="110">
+ width="119">
     <avatar_icon
      follows="left|top"
      height="105"
      left_delta="5"
      name="avatar_icon"
      top="-5"
-     width="105"/>
+     width="114"/>
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -22,7 +22,7 @@
      name="button_stack"
      orientation="vertical"
      top_pad="5"
-     width="105">
+     width="114">
         <layout_panel
          mouse_opaque="false"
          auto_resize="true"
@@ -31,7 +31,7 @@
          layout="topleft"
          left="2"
          min_height="0"
-         width="100"
+         width="109"
          top="0"
          name="spacer"
          user_resize="false" />
@@ -41,7 +41,7 @@
          height="20"
          layout="topleft"
          min_height="20"
-         width="100"
+         width="109"
          name="view_profile_btn_panel"
          user_resize="false">
             <button
@@ -50,7 +50,7 @@
              label="Profile"
              name="view_profile_btn"
              top="0"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -58,7 +58,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="add_friend_btn_panel"
          user_resize="false">
             <button
@@ -67,7 +67,7 @@
              label="Add Friend"
              name="add_friend_btn"
              top="5"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -75,7 +75,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="teleport_btn_panel"
          user_resize="false">
         <button
@@ -85,7 +85,7 @@
              label="Teleport"
              name="teleport_btn"
              tool_tip = "Offer to teleport this person"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -93,7 +93,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="share_btn_panel"
          user_resize="false">
            <button
@@ -102,7 +102,7 @@
              height="23"
              label="Share"
              name="share_btn"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -110,7 +110,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="pay_btn_panel"
          user_resize="false">
            <button
@@ -119,7 +119,7 @@
              height="23"
              label="Pay"
              name="pay_btn"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -127,7 +127,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="call_btn_panel"
          user_resize="false">
             <button
@@ -135,7 +135,7 @@
              height="23"
              label="Call"
              name="call_btn"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -143,7 +143,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="end_call_btn_panel"
          user_resize="false"
          visible="false">
@@ -152,7 +152,7 @@
              height="23"
              label="End Call"
              name="end_call_btn"
-             width="100" />
+             width="109" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -160,7 +160,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="100"
+         width="109"
          name="voice_ctrls_btn_panel"
          user_resize="false"
          visible="false">
@@ -169,7 +169,7 @@
              height="23"
              label="Voice Controls"
              name="voice_ctrls_btn"
-             width="100" />
+             width="109" />
         </layout_panel>
     </layout_stack>
 </panel>
-- 
cgit v1.2.3


From a4e20e993250022872e5f4add8fb49004f9f7dbf Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 21 Apr 2010 14:29:31 +0300
Subject: Implemented EXT-6783(normal sub task) - Implement saving of unread
 notifications.

Utilized old save and load notification code.
Main concern was with notifications that have complex responder - UserGiveItem, ObjectGiveItem. Those responders are object with own fields that need to persist through sessions.

Notifications that should be saved are marked with persist="true" in notifications.xml
Notifications using functor responders are saved automatically.
Notifications using object responders need additional tuning. Responder object should be a) serializable(implement LLNotificationResponderInterface), b) registered with LLResponderRegistry.

At this point following notifications persist through sessions: UserGiveItem, ObjectGiveItem, TeleportOffered, FrienshipOffered.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/211/

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 07304eb14e..5d184fea3a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5066,6 +5066,7 @@ No valid parcel could be found.
   <notification
    icon="notify.tga"
    name="ObjectGiveItem"
+   persist="true"
    type="offer">
 An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
@@ -5110,6 +5111,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
   <notification
    icon="notify.tga"
    name="UserGiveItem"
+   persist="true"
    type="offer">
 [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
@@ -5162,6 +5164,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered"
+   persist="true"
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -5207,6 +5210,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
   <notification
    icon="notify.tga"
    name="OfferFriendship"
+   persist="true"
    type="offer">
 [NAME_SLURL] is offering friendship.
 
-- 
cgit v1.2.3


From 2ce7556e53544e50a4d4d28705976655cafa6992 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 21 Apr 2010 15:44:24 +0300
Subject: Implemented by SL EXT-6722(normal task) - Create modified inventory
 view for "my outfits" tab in top-level appearance sidebar (tier 1)

llui:
- Setting container panel for accordion tab control to dynamically add tabs to accordions.
- Added method to dynamically remove accordion tabs.
- Added LLIconCtrl image setter.

newview:
- Class LLOutfitsList - a list of agents's outfits from "My Outfits" inventory category which represents each outfit by an accordion tab with a list of items inside it.
- Class LLWearableItemsList - a list of wearable items used in each accordion tab of "My Outfits" tab.
- Class LLInventoryItemsList - a base class for LLWearableItemsList that represents inventory items by panels in LLFlatListView.
- Class LLPanelInventoryItem - inventory item representation for a flat list. Item icon is set according to item type.
- Class LLInventoryCategoriesObserver - an observer used in LLOutfitsList for monitoring changes to "My Outfits" inventory category and updating outfits accordion tabs and list of items for each outfit.

Known issues:
- Only first outfit tab is displayed in "My Outfits" until this tab is expanded.
- Bottom bar buttons and filter field not functioning for "My Outfits" tab since LLOutfitsList still doesn't support selection, filtering and sorting.
- "My Outfits" and "Wearing" tabs of "Appearance" side panel might need a common interface to use LLOutfitsList and LLinventoryPanel as tabs in LLPanelOutfitsInventory or "Wearing" tab should be replaces with LLOutfitsList class object i.e. a flat list.

On review - https://codereview.productengine.com/secondlife/r/285/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_inventory_item.xml  | 51 ++++++++++++++++++++++
 .../default/xui/en/panel_outfits_inventory.xml     | 20 ++++-----
 .../skins/default/xui/en/panel_outfits_list.xml    | 25 +++++++++++
 3 files changed, 84 insertions(+), 12 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_inventory_item.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfits_list.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
new file mode 100644
index 0000000000..f1b7b92ece
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="inventory_item"
+ top="0"
+ width="380">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="16"
+     follows="top|left"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="0"
+     name="item_icon"
+     top="0"
+     width="16" />
+    <text
+     follows="left|right"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     allow_html="false"
+     use_ellipses="true"
+     name="item_name"
+     text_color="white"
+     top="4"
+     value="..."
+     width="359" />
+</panel>
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 66ed43efec..b8ad278da7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -23,20 +23,16 @@
      tab_position="top"
      halign="center"
      width="312">
-         <inventory_panel
+         <panel
+           class="outfits_list"
+           filename="panel_outfits_list.xml"
+           height="490"
+           name="outfitslist_tab"
            background_visible="true"
-           background_opaque="true"
-           label="MY OUTFITS"
-           help_topic="my_outfits_tab"
-           allow_multi_select="true"
            follows="all"
-           border="false"
-           left="0"
-           top="0"
-           width="315"
-           mouse_opaque="true"
-           name="outfitslist_tab"
-           start_folder="My Outfits" /> 
+           label="MY OUTFITS"
+           layout="topleft"
+           width="315" />
          <inventory_panel
            follows="all"
            background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
new file mode 100644
index 0000000000..5cf94c25d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   border="false"
+   follows="all"
+   height="400"
+   name="Outfits"
+   layout="topleft"
+   left="0"
+   top="0"
+   width="313">
+    <accordion
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+     bg_opaque_color="DkGray2"
+     follows="all"
+     height="400"
+     layout="topleft"
+     left="3"
+     name="outfits_accordion"
+     top="0"
+     width="307">
+    </accordion>
+</panel>
-- 
cgit v1.2.3


From a1efd4eee8455d656f4d6aa0db8a908f44f3bc1c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 21 Apr 2010 17:31:40 +0300
Subject: Fixed critical bug EXT-4837 ([NUX] When filter results in null state,
 provide a message suggesting the user try global search.)

implementation for:
 * Places->My Landmarks
 * My Inventory->My Inventory
 * My Inventory->Recent
 * My Appearance->Wearing
 * My Appearance->My Outfits
updated common text and search url (secondlife:///app/search/all because concrete category without <search_term> is not supported).

 * People/Friends (Common avatar list support can not be used due to accordions)
  * added two strings with help messages into panel_people.xml (one for case when an avatar has no any friends - moved from textbox, another to be shown when there are no friends matching filter)
  * moved logic to show help text into separate method
  * and updated to be used in both cases: friend list is changed, filter is changed.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 61784fede4..cc579cdd7a 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -29,6 +29,15 @@
     <string
      name="no_friends"
      value="No friends" />
+    <string
+     name="no_friends_msg">
+         Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
+    </string>
+    <string
+     name="no_filtered_friends_msg">
+         Didn't find what you're looking for? Try [secondlife:///app/search/people Search].
+    </string>
     <string
      name="people_filter_label"
      value="Filter People" />
@@ -265,14 +274,11 @@
             <text
              follows="all"
              height="450"
-             left="10"
-             name="no_friends_msg"
+             left="13"
+             name="no_friends_help_text"
              top="10"
              width="293"
-             wrap="true">
-                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
-Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
-             </text>
+             wrap="true" />
         </panel>
         <panel
          background_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 80fddcba43..91c0af118f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1842,7 +1842,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="LeaveMouselook">Press ESC to return to World View</string>
 
 	<!-- inventory -->
-	<string name="InventoryNoMatchingItems">No matching items found in inventory.  Try [secondlife:///app/search/groups "Search"].</string>
+	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
     <!-- use value="" because they have preceding spaces -->
-- 
cgit v1.2.3


From b36539f23f6eba4ac20f53bbb134e2562421dc9c Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 21 Apr 2010 20:05:45 +0300
Subject: Fixed normal EXT-6853 ([HARDCODE] Number of "Person"/ "People" in
 World Map - hard coded?) - added 2 UI strings: "world_map_person" and
 "world_map_people". Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/290/

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
index 9f08d3a817..16860a6117 100644
--- a/indra/newview/skins/default/xui/en/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/en/panel_world_map.xml
@@ -45,6 +45,14 @@
      name="world_map_northwest">
         NW
     </panel.string>
+    <panel.string
+     name="world_map_person">
+        1 person
+    </panel.string>
+    <panel.string
+     name="world_map_people">
+        [NUMBER] people
+    </panel.string>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 647327d0eca0c089d94ce964a8cc837cc2888e93 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 21 Apr 2010 20:23:55 +0300
Subject: Fixed normal bug EXT-6907 ('Show residents profile' menu opens
 inspector instead of profile) - added 'Url.ShowProfile' action. Reviewed by
 Vadim Savchuk at https://codereview.productengine.com/secondlife/r/282/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_url_agent.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_url_group.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/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index fa05dac148..73f0fa7979 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -7,7 +7,7 @@
      layout="topleft"
      name="show_agent">
         <menu_item_call.on_click
-         function="Url.Execute" />
+         function="Url.ShowProfile" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index c5eaf94d22..2cb125ce09 100644
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -7,7 +7,7 @@
      layout="topleft"
      name="show_group">
         <menu_item_call.on_click
-         function="Url.Execute" />
+         function="Url.ShowProfile" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-- 
cgit v1.2.3


From bb25b1961108dd8c43d610d5680601bd36159836 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 21 Apr 2010 16:39:07 -0700
Subject: EXT-617 Create/Build option missing from menu when right-clicking on
 another prim reviewed by Richard CC#206

---
 indra/newview/skins/default/xui/en/menu_object.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/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 8b10c7b049..6ca8766e3f 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -18,16 +18,16 @@
      name="Edit...">
         <menu_item_call.on_click
          function="Object.Edit" />
-        <menu_item_call.on_visible
+    <menu_item_call.on_visible
          function="EnableEdit"/>
     </menu_item_call>
     <menu_item_call
       label="Build"
       name="Build">
       <menu_item_call.on_click
-       function="Object.Edit" />
-      <menu_item_call.on_visible
-       function="VisibleBuild"/>
+        function="Object.Build" />
+        <menu_item_call.on_visible
+         function="EnableEdit"/>
     </menu_item_call>
    <menu_item_call
      enabled="false"
-- 
cgit v1.2.3


From 41d860deb617c9e32a1eafe7e56fc03f0be545c5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 22 Apr 2010 12:47:06 +0300
Subject: Fixed critical bug EXT-6990 ( Unable to select group on 'People->My
 groups' tab)

This is workaroung to actually enable selection functionality in that tab. Copied default "allow_select" value from widget to group list xml.
Trivial change, not reviewed.


Real reason is that for some reason base attributes are not loaded from the flat_list_view.xml file.
It is investigated in scope of EXT-6990.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index cc579cdd7a..fa4213667b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -299,6 +299,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
     -->
             <group_list
+             allow_select="true" 
              background_visible="true"
              bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
-- 
cgit v1.2.3


From edd0e47d5cb3eb173da4d6710ce6a83f771a0246 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 22 Apr 2010 12:40:36 +0300
Subject: Fixed EXT-6597(normal) - Clicking the maturity rating icons in the
 navbar need tooltips and clicking should link to a help article.

Added LLButton::setImagePressed(), there was no way to set pressed image at run-time. The only place where pressed image is initialized was LLButton constructor.

Replaced Maturity icon with button to simplify handling clicks. Icon does not provide click callback and we would need to handle mouse up/down events and track clicked widget.

Added icon for Moderate regions.

Did not find maturity help topic, added a "TODO".

Reviewed by Sergey Litovchuk - https://codereview.productengine.com/secondlife/r/243/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml                | 3 +++
 indra/newview/skins/default/xui/en/widgets/location_input.xml | 4 +++-
 2 files changed, 6 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 91c0af118f..023aba8d7b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2897,6 +2897,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string>
   <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string>
   <string name="LocationCtrlDamageTooltip">Health</string>
+  <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
+  <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
+  <string name="LocationCtrlGeneralIconTooltip">General Region</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
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 1d61447e31..02ea661da3 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -6,6 +6,8 @@
 <location_input font="SansSerifSmall"
                 icon_maturity_general="Parcel_PG_Light"
                 icon_maturity_adult="Parcel_R_Light"
+                icon_maturity_moderate="Parcel_M_Light"
+                maturity_help_topic="TODO"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
@@ -43,7 +45,7 @@
                           scale_image="false"
 			  top="19"
 			  left="-3" />
-  <maturity_icon
+  <maturity_button
     name="maturity_icon"
     width="18"
     height="16"
-- 
cgit v1.2.3


From b15e2beabfc2987ba8d17b74014074ba313b5db7 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 22 Apr 2010 15:48:48 +0300
Subject: Implemented EXT-6724(normal task) - Implement flat list view of
 filtered inventory for "add wearables" panel of outfit editor 1. Modified
 LLInventoryItemsList - implemented delayed item construction. Items are added
 during draw, not more than 50 items will be added in single draw. This lets
 us reduce system overload during multiple panel construction. 2. Implemented
 LLFilteredWearableListManager to populate inventory flat list with data. This
 class filters entire inventory according to specified filter and populates
 specified inventory list with data. 3. Created
 LLCommonUtil::computeDifference() to avoid code copy-pasting(will use it in
 all appropriate places in next review request)

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/301/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index c77e4e8d5e..b1f0ff15cb 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -341,6 +341,30 @@
              top_pad="5"
              width="300"/>
 
+            <panel
+             name="filtered_wearables_panel"
+             background_opaque="true"
+             background_visible="true"
+             layout="topleft"
+             follows="left|top|right|bottom"
+             border="false"
+             height="155"
+             left="0"
+             mouse_opaque="false"
+             width="300"
+             top_delta="0"
+             visible="false">
+             <wearable_items_list
+              name="filtered_wearables_list"
+              allow_select="true"
+              layout="topleft"
+              follows="all"
+              width="300"
+              height="155"
+              left="0"
+              top="0" />
+            </panel>
+
             <panel
              background_visible="true"
              bevel_style="none"
-- 
cgit v1.2.3


From 9166e7a8a0e7bf741836c9fa41bca6368f26ec0f Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 23 Apr 2010 07:46:34 +0300
Subject: Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat
 window appears in EN)

- Added instead of hardcoded string two strings to the strings.xml

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++++
 1 file changed, 4 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 023aba8d7b..ec41703979 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2933,6 +2933,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	  Failed to start viewer
 	</string>
 
+	<!-- System Messages -->
+	<string name="ItemsComingInTooFastFrom">[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds</string>
+	<string name="ItemsComingInTooFast">[APP_NAME]: Items coming in too fast, automatic preview disabled for [TIME] seconds</string>
+
 	<!-- IM system messages -->
 	<string name="IM_logging_string">-- Instant message logging enabled --</string>
 	<string name="IM_typing_start_string">[NAME] is typing...</string>
-- 
cgit v1.2.3


From c5aa11e04f77735b6ea57f13d804ccd1044d104e Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 23 Apr 2010 07:58:04 +0300
Subject: Fixed normal EXT-6845 ([TRUNCATION] Media Control. \"Parar tod\" -
 \"Iniciar to\")

- Increased buttons width and panel width

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_nearby_media.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_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index ff2aae645b..f5a78fc929 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -7,7 +7,7 @@
   background_opaque="true"
 	background_visible="true"
 	layout="topleft"
-	width="270"
+	width="328"
 	height="230"
 	name="nearby_media"
 	help_topic="nearby_media">
@@ -29,7 +29,7 @@
 		follows="left"
 		tool_tip="Turn all nearby media off"
 		left="8"
-		width="66"
+		width="95"
 		height="22"
 		label="Stop All">
 	  <button.commit_callback
@@ -40,7 +40,7 @@
 		follows="left"
 		tool_tip="Turn all nearby media on"
 		left_pad="4"
-		width="66"
+		width="95"
 		height="22"
 		label="Start All">
 	  <button.commit_callback
-- 
cgit v1.2.3


From 2b59f37d4bb4c6c5a6b8141829c14b04c14863ff Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 23 Apr 2010 08:04:29 +0300
Subject: Fixed normal bug EXT-6904 (Edit Appearence panel has UI corrupted in
 IT)

- Main changes:
    - Increased floater, tabcontainer, scrollcontainer and 'Revert' button width
    - Made layout of Item Action Label and 'Save', 'Save As', 'Revert' buttons equally for all panels

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_customize.xml     | 660 ++++++++++-----------
 1 file changed, 330 insertions(+), 330 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 32460e937d..01bced81d0 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -11,7 +11,7 @@
  save_rect="true"
  title="APPEARANCE"
  top_delta="-185"
- width="524">
+ width="600">
     <tab_container
      height="517"
      layout="topleft"
@@ -21,7 +21,7 @@
      tab_position="left"
      tab_height="50"
      top="26"
-     width="506">
+     width="580">
             <text
              type="string"
              length="1"
@@ -65,15 +65,15 @@
              mouse_opaque="true"
              width="16" />
             <button
-             follows="right|bottom"
+             follows="left|top"
              height="23"
-             label="Revert"
-             label_selected="Revert"
+             label="Create New Shape"
+             label_selected="Create New Shape"
              layout="topleft"
-             right="390"
-             name="Revert"
-             top="477"
-             width="82" />
+             left="10"
+             name="Create New"
+             top="104"
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -280,46 +280,46 @@
              type="string"
              length="1"
              top="488"
-             follows="left|top|right"
+             follows="left|top"
              font="SansSerif"
              halign="right"
              height="23"
              layout="topleft"
+             left="10"
              name="Item Action Label"
-             right="90"
-             width="100">
+             width="130">
                 Shape:
             </text>
             <button
-             follows="left|top"
-             height="23"
-             label="Create New Shape"
-             label_selected="Create New Shape"
-             layout="topleft"
-             left="10"
-             name="Create New"
-             top="104"
-             width="160" />
-            <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="186"
+             left_pad="2"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
              name="Save As"
              top="477"
-             right="304"
+             left_pad="3"
              width="115" />
+            <button
+             follows="left|bottom"
+             height="23"
+             label="Revert"
+             label_selected="Revert"
+             layout="topleft"
+             left_pad="3"
+             name="Revert"
+             top="477"
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -349,6 +349,16 @@
              layout="topleft"
              mouse_opaque="true"
              width="16" />
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Skin"
+             label_selected="Create New Skin"
+             layout="topleft"
+             left_delta="0"
+             name="Create New"
+             top_delta="-249"
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -479,20 +489,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             name="Item Action Label"
-             right="90"
-             width="100">
-                Skin:
-            </text>
             <texture_picker
              allow_no_texture="true"
              can_apply_immediately="true"
@@ -532,46 +528,50 @@
              tool_tip="Click to choose a picture"
              top_delta="102"
              width="82" />
-            <button
+            <text
+             type="string"
+             length="1"
+             top="488"
              follows="left|top"
+             font="SansSerif"
+             halign="right"
              height="23"
-             label="Create New Skin"
-             label_selected="Create New Skin"
              layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-249"
-             width="160" />
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Skin:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -729,20 +729,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Hair:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -765,36 +751,50 @@
              name="Create New"
              top_delta="-89"
              width="160" />
+            <text
+             type="string"
+             length="1"
+             top="488"
+             follows="left|top"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="topleft"
+             name="Item Action Label"
+             left="10"
+             width="130">
+                Hair:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -914,20 +914,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Eyes:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -949,36 +935,50 @@
              name="Create New"
              top="66"
              width="160" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             left="10"
+             width="130">
+                Eyes:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
             <text
              type="string"
@@ -1063,36 +1063,50 @@
              name="Create New"
              top="66"
              width="160" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             left="10"
+             width="130">
+                Shirt:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
             <text
              type="string"
              length="1"
@@ -1183,20 +1197,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Shirt:
-            </text>
         </panel>
         <panel
          border="false"
@@ -1266,36 +1266,50 @@
              name="Create New"
              top="66"
              width="160" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             left="10"
+             width="130">
+                Pants:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
             <text
              type="string"
              length="1"
@@ -1386,20 +1400,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Pants:
-            </text>
         </panel>
         <panel
          border="false"
@@ -1528,20 +1528,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Shoes:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1573,36 +1559,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Shoes:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -1731,20 +1731,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Socks:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1776,36 +1762,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Socks:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -1934,20 +1934,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Jacket:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1990,36 +1976,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Jacket:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -2148,20 +2148,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Gloves:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2193,36 +2179,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Gloves:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -2351,20 +2351,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Undershirt:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2396,36 +2382,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Undershirt:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -2554,20 +2554,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Underpants:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2599,36 +2585,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Underpants:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -2757,20 +2757,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Skirt:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2802,36 +2788,50 @@
              name="Take Off"
              top_pad="4"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Skirt:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -2960,20 +2960,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Tattoo:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -3018,36 +3004,50 @@
              top_pad="4"
              left="10"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Tattoo:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
         <panel
          border="false"
@@ -3176,20 +3176,6 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom|right"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             right="90" 
-             width="100">
-                Alpha:
-            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -3299,47 +3285,61 @@
              left="10"
              top_pad="20"
              width="82" />
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             left="10"
+             name="Item Action Label"
+             width="130">
+                Alpha:
+            </text>
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="186"
+             left_pad="2"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             right="304"
+             left_pad="3"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="right|bottom"
+             follows="left|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             right="390"
+             left_pad="3"
              name="Revert"
              top="477"
-             width="82" />
+             width="120" />
         </panel>
     </tab_container>
     <scroll_container
      follows="left|top|right|bottom"
      height="409"
      layout="topleft"
-     left="211"
+     left="247"
      mouse_opaque="false"
      name="panel_container"
      top="92"
-     width="292">
+     width="330">
         <scrolling_panel_list
          follows="left|bottom"
          layout="topleft"
@@ -3355,7 +3355,7 @@
      name="script_info"
      tool_tip="Show scripts attached to your avatar"
      left="13"
-     width="90" />
+     width="90" ></button>
     <button
      bottom="574"
      follows="right|bottom"
-- 
cgit v1.2.3


From 720a50daed53b6f42e3c722bebd5257fbb4d87b5 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 23 Apr 2010 08:09:34 +0300
Subject: Fixed normal EXT-6927 (Vertical tabs not attached to tab panel)

- Decreased space between tabs and panel in tab container

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_preferences.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_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 49361784ae..6e82bb09ee 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -47,7 +47,7 @@
      tab_group="1"
      tab_position="left"
      tab_width="115"
-     tab_padding_right="5"
+     tab_padding_right="0"
      top="21"
      width="658">
         <panel
-- 
cgit v1.2.3


From 181315db32165d71f2e1baec66caca24cd74ced7 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 23 Apr 2010 14:35:24 +0300
Subject: completed EXT-6721 (Enable UI for user modification of wearable
 order)

- added functionality to change order of wearables
- added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg
- added displaying wearables as sorted by order on the Edit Outfit panel (top list)

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index c77e4e8d5e..79b952237e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -221,6 +221,30 @@
                  name="new_btn"
                  top="1"
                  width="31" />
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Movement_Forward_On"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="move_closer_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Movement_Backward_On"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="move_further_btn"
+                 top="1"
+                 width="31" />
                 <button
                  follows="bottom|right"
                  height="25"
-- 
cgit v1.2.3


From aab59821607f45376e19b6aab29b99a8ca4912ca Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 23 Apr 2010 15:46:20 +0300
Subject: fix EXT-6766 The number of characters allowed in the Chat Edit Window
 in Vewer 2 is 1/2 that in Vewer 1 reviewed Mike Antipov
 https://codereview.productengine.com/secondlife/r/305/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.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_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 184ea54fcb..5dbd8bfe6a 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -17,7 +17,7 @@
      layout="topleft"
      left_delta="3"
      left="0"
-     max_length="512"
+     max_length="1024"
      name="chat_box"
      text_pad_left="5"
      text_pad_right="25"
-- 
cgit v1.2.3


From 5dfc5d020c0497619ae23da61a45f6671903d02c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 23 Apr 2010 17:44:33 +0300
Subject: Work on task  EXT-6722 (Create modified inventory view for "my
 outfits" tab in top-level appearance sidebar)

Code improvements:
 * Moved Accordion tab + Flat list into separate xml.
 * Implemented dynamic creation of the accordion tab via xml

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/outfit_accordion_tab.xml      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/outfit_accordion_tab.xml

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

diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
new file mode 100644
index 0000000000..d00b1bfb7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
+<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
+<accordion_tab
+ display_children="false"
+ follows="all"
+ height="40"
+ layout="topleft"
+ name="Mockup Tab"
+ title="Mockup Tab"
+ width="0">
+    <wearable_items_list
+     allow_select="true"
+     follows="all"
+     keep_one_selected="true"
+     name="wearable_items_list"
+    />
+</accordion_tab>
-- 
cgit v1.2.3


From c540ef450a2567b18174f8bbe7c115a52c63b743 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 23 Apr 2010 21:40:41 +0300
Subject: Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference'
 notification is shown while connecting to ad-hoc voice chat).

Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names.

- First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible.

- Second was solved by placing "Leaving..." textbox lower

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_outgoing_call.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_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index 5ea207675b..9db6568ee3 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -119,7 +119,7 @@ No Answer.  Please try again later.
      layout="topleft"
      left="77"
      name="leaving"
-     top="52"
+     top="62"
      width="315"
      word_wrap="true">
 Leaving [CURRENT_CHAT].
-- 
cgit v1.2.3


From d0204a2b149462371ee20725067e43b018c485bb Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 23 Apr 2010 21:52:18 +0300
Subject: Related to normal bug EXT-6302 (TP requests need to display
 destination region maturity) - added displaying maturity rating with an icon.
 Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/229/.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5d184fea3a..4479a3dd4d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5168,7 +5168,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
-[MESSAGE], ([MATURITY])
+[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
     <form name="form">
       <button
        index="0"
-- 
cgit v1.2.3


From c495e7f42a3e20f217949cb32e3e63043b978334 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 27 Apr 2010 14:03:42 -0400
Subject: EXT-7109 : Ensure "Open" works for all types, change to "Open
 Original" for links

Added new "Open Original" menu item for links, to clarify that you're opening the item the link is pointing to.
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5e1f6b58e8..11459ad0e6 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -409,6 +409,14 @@
          function="Inventory.DoToSelected"
          parameter="open" />
     </menu_item_call>
+    <menu_item_call
+     label="Open Original"
+     layout="topleft"
+     name="Open Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_original" />
+    </menu_item_call>
     <menu_item_call
      label="Properties"
      layout="topleft"
-- 
cgit v1.2.3


From aa7b3312c201ccea29a0e07a38021bec764bfc64 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 27 Apr 2010 17:20:35 -0400
Subject: Small XML fix for Inventory Floater, which was obscuring the text
 showing the number of items fetched.

---
 indra/newview/skins/default/xui/en/panel_main_inventory.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_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 27d66945d9..46625144e1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  default_tab_group="1"
  follows="all"
- height="408"
+ height="423"
  label="Things"
  layout="topleft"
  min_height="350"
@@ -48,7 +48,7 @@
    left="10"
    max_length="300"
    name="inventory search editor"
-   top="3"
+   top="18"
    width="303" />
   <tab_container
      bg_alpha_color="DkGray"
-- 
cgit v1.2.3


From fbfc85176670f3f948e6e2f00c8d8e37c96d5299 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Mon, 26 Apr 2010 18:56:28 +0300
Subject: (EXT-6722) Create modified inventory view for "my outfits" tab in
 top-level appearance sidebar (tier 1)

llui:
- Setting container panel for accordion tab control to dynamically add tabs to accordions.
- Added method to dynamically remove accordion tabs.
- Added LLIconCtrl image setter.

newview:
- Class LLOutfitsList - a list of agents's outfits from "My Outfits" inventory category which represents each outfit by an accordion tab with a list of items inside it.
- Class LLWearableItemsList - a list of wearable items used in each accordion tab of "My Outfits" tab.
- Class LLInventoryItemsList - a base class for LLWearableItemsList that represents inventory items by panels in LLFlatListView.
- Class LLPanelInventoryItem - inventory item representation for a flat list. Item icon is set according to item type.
- Class LLInventoryCategoriesObserver - an observer used in LLOutfitsList for monitoring changes to "My Outfits" inventory category and updating outfits accordion tabs and list of items for each outfit.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/outfit_accordion_tab.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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index d00b1bfb7b..b3150bb98b 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
-<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
+<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime-->
 <accordion_tab
  display_children="false"
  follows="all"
- height="40"
+ height="45"
  layout="topleft"
  name="Mockup Tab"
  title="Mockup Tab"
-- 
cgit v1.2.3


From 5496531b9f8687dbdd2fd78a78b49ea20dd680df Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 27 Apr 2010 08:17:25 +0300
Subject: Fixed normal bug EXT-6581 ('Buy' floater looks corrupted after size
 reducing)

-increased floater minimal width
-decreased width of TextBox with truncated string and used 'use_ellipses' for it
-deleted overriden button width dimension in DE locale

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

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index f0e5e30010..3d8f5d678b 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -5,7 +5,7 @@
  height="290"
  layout="topleft"
  min_height="150"
- min_width="200"
+ min_width="225"
  name="contents"
  help_topic="contents"
  save_rect="true"
@@ -52,7 +52,7 @@
     <text
      type="string"
      length="1"
-     follows="all"
+     follows="left|top|right"
      font="SansSerif"
      height="16"
      layout="topleft"
@@ -90,7 +90,8 @@
      name="buy_text"
      text_color="white"
      top_pad="5"
-     width="276">
+     use_ellipses="true"
+     width="260">
         Buy for L$[AMOUNT] from [NAME]?
     </text>
     <button
-- 
cgit v1.2.3


From 9e25d92b4207c6ac4a814842b16d5415006c384f Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 27 Apr 2010 08:21:40 +0300
Subject: Fixed normal bug EXT-6878 ([OVERLAP] Acerca del terreno (About Land)
 window > Objetos. Overlapped text and arrow.)

- applied wrap to string that overlaps line editor
- deleted overriden dimensions in other locales

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 59f1889808..40c6b14a4a 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1061,7 +1061,8 @@ Leyla Linden               </text>
              left="10"
              name="Autoreturn"
              top_pad="0"
-             width="310">
+             width="412"
+             wrap="true">
                 Auto return other Residents&apos; objects (minutes, 0 for off):
             </text>
             <line_editor
@@ -1073,9 +1074,9 @@ Leyla Linden               </text>
              layout="topleft"
              max_length="6"
              name="clean other time"
-             right="-72"
-             width="56"
-             top_delta="-6"/>
+             left_pad="0"
+             width="46"
+             top_delta="-2"/>
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From a848955d41903d631c10fde1e36897f2f04f1f97 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 27 Apr 2010 08:25:03 +0300
Subject: Fixed normal bug EXT-6882 ([EN FORMATTING] Comprar terreno (Buying
 Land) window. Blank space needed between \"...de terreno.\" and \"Este
 terreno...\")

- added space in the strings.xml for translation, so that languages that need the space (English, Spanish, French, etc.) can have it, and languages that don't (Japanese, Chinese etc) can remove it

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

--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 ec41703979..bf30e89a59 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3117,4 +3117,7 @@ Abuse Report</string>
   <string name="DefaultMimeType">none/none</string>
   <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
 
+  <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
+  <string name="sentences_separator" value=" "></string>
+
   </strings>
-- 
cgit v1.2.3


From 611dfccfcb58878d24d65e50eca0f2364bb16ee5 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 27 Apr 2010 08:28:30 +0300
Subject: Fixed normal EXT-7020 (Make \"port number\" field more wider, as
 fourth number is unable to be seen)

- Made \"port number\" field more wider

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

--HG--
branch : product-engine
---
 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 500e65b916..2c6ceeef2e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -374,5 +374,5 @@
    min_val="10"
    name="web_proxy_port"
    top_delta="0"
-   width="140" />
+   width="145" />
 </panel>
-- 
cgit v1.2.3


From 2696e375097c2e45102bede0e7d33175feea080b Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 27 Apr 2010 15:23:07 +0300
Subject: partial implementation of EXT-6723 Create specialized view of
 inventory for "clothing" accordion tab of outfit editor

Initial implementation (no sorting, no grayed items from Base outfit)

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_cof_wearables.xml   | 65 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_outfit_edit.xml     | 29 +++-------
 2 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_cof_wearables.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
new file mode 100644
index 0000000000..01c7ae61d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bg_alpha_color="DkGray"
+ border="false"
+ bottom="0"
+ follows="all"
+ height="200"
+ left="0"
+ name="cof_wearables"
+ width="313">
+    <accordion
+     follows="all"
+     height="373"
+     layout="topleft"
+     left="3"
+     top="0"
+     name="cof_wearables_accordion"
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+     width="307">
+        <accordion_tab
+         layout="topleft"
+         name="tab_attachments"
+         title="Attachments">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_attachments"
+             top="0"
+             width="307" />
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_clothing"
+         title="Clothing">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_clothing"
+             top="0"
+             width="307" />
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_body_parts"
+         title="Body Parts">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_body_parts"
+             top="0"
+             width="307" />
+        </accordion_tab>
+    </accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 314d2389ae..73181392c9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -149,29 +149,18 @@
          auto_resize="true"
          user_resize="true">
 
-            <scroll_list
-             width="300"
-             column_padding="0"
-             draw_heading="false"
-             draw_stripes="false"
+            <!-- List containing items from the COF and Base outfit -->
+            <panel
+             background_visible="false"
+             class="cof_wearables"
+             filename="panel_cof_wearables.xml"
              follows="left|top|right|bottom"
+             height="193"
              layout="topleft"
-             name="look_items_list"
-             search_column="1"
-             sort_column="2"
              left="0"
-             height="193"
-             top="0">
-                <scroll_list.columns
-                 label="Look Item"
-                 name="look_item"
-                 width="285" />
-                <scroll_list.columns
-                 label="Outfit Item Sort"
-                 width="0"
-                 sort_column="look_item_sort"
-                 name="look_item_sort" />
-            </scroll_list>
+             name="cof_wearables_list"
+             top="0"
+             width="300" /> 
 
           <panel
              background_visible="true"
-- 
cgit v1.2.3


From 17f2234a96d11a78726a77285b77dd25721ab8ce Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 27 Apr 2010 16:39:19 +0300
Subject: Implemented perpetual loading indicator widget (EXT-6596).

Simple perpetual loading indicator a la MacOS X or YouTube.
Implements spinning by changing pre-defined images.
The images are hardcoded, shared by all instances of the widget.
Number of rotations per second can be changed via params.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/loading_indicator.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/loading_indicator.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
new file mode 100644
index 0000000000..6040d24128
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<loading_indicator
+    follows="left|top"
+    mouse_opaque="false"
+    name="loading_indicator"
+    rotations_per_sec="1.0"
+    tab_stop="false"
+/>
-- 
cgit v1.2.3


From 62214e082f8ba47f1224353422a4606c5c01b14f Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 27 Apr 2010 19:26:33 +0300
Subject: fix EXT-6998 Group creator has no rights to view group owned land
 reviewded Mike Antipov https://codereview.productengine.com/secondlife/r/319/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_land_money.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_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 9e99a8ceaf..76f7484c68 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -16,6 +16,10 @@
      name="cant_view_group_land_text">
         You don&apos;t have permission to view group owned land
     </panel.string>
+    <panel.string
+     name="epmty_view_group_land_text">
+        No entries
+    </panel.string>
     <panel.string
      name="cant_view_group_accounting_text">
         You don&apos;t have permission to view the group&apos;s accounting information.
-- 
cgit v1.2.3


From e83fee05897e21d9d99b20bb76c48d388a30c368 Mon Sep 17 00:00:00 2001
From: Samuel Kolb <skolb@lindenlab.com>
Date: Tue, 27 Apr 2010 10:08:30 -0700
Subject: fixed up mime_types.xml files to point to a plugin in all cases.

---
 indra/newview/skins/default/xui/en/mime_types.xml  | 32 +++++++++++++++++++++-
 .../skins/default/xui/en/mime_types_linux.xml      | 32 +++++++++++++++++++++-
 .../skins/default/xui/en/mime_types_mac.xml        | 30 ++++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index 8e1e5ff062..a585069faa 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -120,7 +120,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_webkit
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -130,6 +130,9 @@
 		<widgettype>
 			none
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
@@ -160,6 +163,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
@@ -179,6 +185,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
@@ -187,6 +196,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
@@ -195,6 +207,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
@@ -203,6 +218,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">
@@ -211,6 +229,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
@@ -219,6 +240,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
@@ -227,6 +251,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">
@@ -235,6 +262,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 4748c14554..e95b371d00 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -120,7 +120,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_gstreamer
+			media_plugin_webkit
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -130,6 +130,9 @@
 		<widgettype>
 			none
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
@@ -160,6 +163,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
@@ -179,6 +185,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
@@ -187,6 +196,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
@@ -195,6 +207,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
@@ -203,6 +218,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">
@@ -211,6 +229,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
@@ -219,6 +240,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
@@ -227,6 +251,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">
@@ -235,6 +262,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 8e1e5ff062..7931e55c0a 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -130,6 +130,9 @@
 		<widgettype>
 			none
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
@@ -160,6 +163,9 @@
 		<widgettype>
 			image
 		</widgettype>
+        <impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
@@ -179,6 +185,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
@@ -187,6 +196,9 @@
 		<widgettype>
 			audio
 		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
@@ -195,6 +207,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
@@ -203,6 +218,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">
@@ -211,6 +229,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
@@ -219,6 +240,9 @@
 		<widgettype>
 			movie
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
@@ -227,6 +251,9 @@
 		<widgettype>
 			web
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">
@@ -235,6 +262,9 @@
 		<widgettype>
 			image
 		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-- 
cgit v1.2.3


From dacc5afbf0f1bde7454c1eadf56edb669d0741a9 Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Tue, 27 Apr 2010 17:25:01 -0700
Subject: Architectural changes to LLPlugin message processing.

LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets.  If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame.  This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them).  This is currently disabled by default, until it's had a bit more focused testing on multiple platforms.

Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest.

Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation.

LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit).  The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way.

LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame.  This should reduce the latency of sending plugin messages.

Added a separate fast timer for LLViewerMedia::updateMedia().
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(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 3af80f63fe..df4f33adf0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1339,6 +1339,16 @@
              function="ToggleControl"
              parameter="RunMultipleThreads" />
         </menu_item_check>
+        <menu_item_check
+         label="Use Plugin Read Thread"
+         name="Use Plugin Read Thread">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="PluginUseReadThread" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="PluginUseReadThread" />
+        </menu_item_check>
         <menu_item_call
          label="Clear Group Cache"
          name="ClearGroupCache">
-- 
cgit v1.2.3


From 872b4d7ed0bd532e349d3c177a63d48e17d0bdb3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 28 Apr 2010 11:00:53 +0300
Subject: Fixed critical bug EXT-4837 ( [NUX] When filter results in null
 state, provide a message suggesting the user try global search.)

Implemented passing of entered filter substring without head spaces to search URI in help message for null filtered results.
* Updated setting "no item message" to use search term from filter editor for avatar & group lists and for inventory panels.
* Updated appropriate translatable strings to get [SEARCH_TERM] substitution.
* Updated processing of filter substring to pass original string to methods applied new filter.

Additional necessary changes
* Changed place to set "no item message" for group list from refresh to where filter is updated (like in avatar lists)
* Removed converting of filter substring to upper case in Places & My Appearance sidepanels (this conversion has already been implemented in where filter is applied)
* Added a separate message for Landmarks to set search URI to secondlife:///app/search/places for Lanmarks panel;
 other inventory related panels have URL to all searched categories (secondlife:///app/search/all)

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 8 ++++----
 indra/newview/skins/default/xui/en/strings.xml      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index fa4213667b..066ea3be6e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -16,13 +16,13 @@
      value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_filtered_recent_people"
-     value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." />
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
     <string
      name="no_one_near"
      value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_one_filtered_near"
-     value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." />
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -36,7 +36,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
     </string>
     <string
      name="no_filtered_friends_msg">
-         Didn't find what you're looking for? Try [secondlife:///app/search/people Search].
+         Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
     </string>
     <string
      name="people_filter_label"
@@ -50,7 +50,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      -->
     <string
      name="no_filtered_groups_msg"
-     value="Didn't find what you're looking for? Try [secondlife:///app/search/groups Search]." />
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." />
     <string
      name="no_groups_msg"
      value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bf30e89a59..b0e43e72ed 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1842,7 +1842,8 @@ Clears (deletes) the media and all params from the given face.
 	<string name="LeaveMouselook">Press ESC to return to World View</string>
 
 	<!-- inventory -->
-	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all Search].</string>
+	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
+	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
     <!-- use value="" because they have preceding spaces -->
-- 
cgit v1.2.3


From 9e8f820e35d9d9ea9318f51ac1f46b11f61a68f7 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 28 Apr 2010 11:26:03 +0300
Subject: Improved xml file according to Eric's suggestion: controls are not
 intended to be translated marked with translate="false" attribute. Trivial,
 not reviewed.

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

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

diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index b3150bb98b..5fcc9b012b 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
 <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime-->
+<!-- Non of string values of controls below are visible to user. They are not need to be translated. -->
 <accordion_tab
  display_children="false"
  follows="all"
@@ -8,11 +9,13 @@
  layout="topleft"
  name="Mockup Tab"
  title="Mockup Tab"
+ translate="false"
  width="0">
     <wearable_items_list
      allow_select="true"
      follows="all"
      keep_one_selected="true"
      name="wearable_items_list"
+     translate="false"
     />
 </accordion_tab>
-- 
cgit v1.2.3


From e8540593e6bfd17f86b76dcfcac9442cea9a8cb6 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 28 Apr 2010 14:48:16 +0300
Subject: Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change).

- Removed string fragmentation by changing concatenation of name and action to whole-sentence strings.

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

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

(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 b0e43e72ed..3cba76cbfa 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2951,8 +2951,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
 	<!-- voice calls -->
 	<string name="answered_call">Your call has been answered</string>
-	<string name="started_call">Started a voice call</string>
-	<string name="joined_call">Joined the voice call</string>
+	<string name="you_started_call">You started a voice call</string>
+	<string name="you_joined_call">You joined the voice call</string>
+	<string name="name_started_call">[NAME] started a voice call</string>
 
   <string name="ringing-im">
     Joining voice call...
-- 
cgit v1.2.3


From 6d3c960525afda3bcdb7ef3e58b67ae1bd4a4dd3 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 28 Apr 2010 14:50:33 +0300
Subject: Implemented major task EXT-6979 (Connect wearable editor texture and
 color editors to the textures stored in the wearables themselves):  - added
 PickerControlEntry - dictionary entry which contains information about
 particular picker control  - added ColorSwatchCtrls and TextureCtrls - lists
 of PickerControlEntries, contain information about color and texture controls
 for particular EWearableType  - implemented some helper functions for picker
 management Reviewed by Neal Orman at
 https://codereview.productengine.com/secondlife/r/327/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_alpha.xml      | 25 +++++++++++++++++-----
 .../skins/default/xui/en/panel_edit_eyes.xml       |  7 ++++--
 .../skins/default/xui/en/panel_edit_gloves.xml     | 14 ++++++++----
 .../skins/default/xui/en/panel_edit_hair.xml       |  7 ++++--
 .../skins/default/xui/en/panel_edit_jacket.xml     | 15 ++++++++++---
 .../skins/default/xui/en/panel_edit_pants.xml      | 10 +++++++--
 .../skins/default/xui/en/panel_edit_shirt.xml      | 10 +++++++--
 .../skins/default/xui/en/panel_edit_shoes.xml      | 10 +++++++--
 .../skins/default/xui/en/panel_edit_skin.xml       | 17 +++++++++++----
 .../skins/default/xui/en/panel_edit_skirt.xml      | 10 +++++++--
 .../skins/default/xui/en/panel_edit_socks.xml      | 10 +++++++--
 .../skins/default/xui/en/panel_edit_underpants.xml | 10 +++++++--
 .../skins/default/xui/en/panel_edit_undershirt.xml | 10 +++++++--
 13 files changed, 121 insertions(+), 34 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 1d0c0a02b0..cfcdc25f81 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -32,7 +32,10 @@
         name="Lower Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94" />
+        width="94" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <check_box
         control_name="LowerAlphaTextureInvisible"
         follows="left"
@@ -53,7 +56,10 @@
         name="Upper Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94" />
+        width="94">
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <check_box
         control_name="UpperAlphaTextureInvisible"
         follows="left"
@@ -74,7 +80,10 @@
         name="Head Alpha"
         tool_tip="Click to choose a picture"
         top="120"
-        width="94" />
+        width="94" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <check_box
         control_name="HeadAlphaTextureInvisible"
         follows="left"
@@ -95,7 +104,10 @@
         name="Eye Alpha"
         tool_tip="Click to choose a picture"
         top="120"
-        width="94" />
+        width="94" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <check_box
         control_name="Eye AlphaTextureInvisible"
         follows="left"
@@ -116,7 +128,10 @@
         name="Hair Alpha"
         tool_tip="Click to choose a picture"
         top="230"
-        width="94" />
+        width="94" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <check_box
         control_name="HairAlphaTextureInvisible"
         follows="left"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
index f11ef43c76..4149a0b06f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
@@ -32,8 +32,11 @@
              name="Iris"
              tool_tip="Click to choose a picture"
              top="10"
-             width="64" />
-	 </panel>
+             width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
+     </panel>
      <panel
          border="false"
          bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
index 7d8eed5085..94fd2f9080 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,9 +46,12 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
-	 </panel>
-	 <panel
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
+     </panel>
+     <panel
          border="false"
          bg_alpha_color="DkGray2"
          bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
index cd81aa2c4f..9b60e83387 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
@@ -32,8 +32,11 @@
              name="Texture"
              tool_tip="Click to choose a picture"
              top="10"
-             width="64" />
-	 </panel>
+             width="64" >
+              <texture_picker.commit_callback
+                  function="TexturePicker.Commit" />
+            </texture_picker>
+     </panel>
    <panel
          border="false"
          bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index ba03865937..248ae9fe04 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
@@ -32,7 +32,10 @@
         name="Upper Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="74" />
+        width="74" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -44,7 +47,10 @@
         name="Lower Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="74" />
+        width="74" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -55,7 +61,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="74" />
+        width="74" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
index 5b02d1f968..3ed1df2399 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
      <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
index 7da8de4c0b..e088aa05ac 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
      <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
index 84fe26f7f6..e079047a86 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
      <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
index b5c8c95473..9158685c40 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
@@ -33,7 +33,10 @@
         name="Head Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
-        width="74" />
+        width="74" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <texture_picker
         allow_no_texture="true"
         can_apply_immediately="true"
@@ -46,7 +49,10 @@
         name="Upper Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
-        width="74" />
+        width="74" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <texture_picker
         allow_no_texture="true"
         can_apply_immediately="true"
@@ -59,8 +65,11 @@
         name="Lower Tattoos"
         tool_tip="Click to choose a picture"
         top="10"
-        width="74" />
-	 </panel>
+        width="74" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
+     </panel>
      <panel
          border="false"
          bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
index 16f6950bd5..87f3270b31 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
index e4f916703b..5bd99969a2 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open color picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
 	 </panel>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
index d43497c943..bbe5230341 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
@@ -32,7 +32,10 @@
              name="Fabric"
              tool_tip="Click to choose a picture"
              top="10"
-             width="64" />
+             width="64" >
+              <texture_picker.commit_callback
+                  function="TexturePicker.Commit" />
+            </texture_picker>
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
@@ -43,7 +46,10 @@
              name="Color/Tint"
              tool_tip="Click to open color picker"
              top="10"
-             width="64" />
+             width="64" >
+              <color_swatch.commit_callback
+                  function="ColorSwatch.Commit" />
+            </color_swatch>
 	 </panel>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
index 45c6ef4526..a79c1b9eaa 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
@@ -32,7 +32,10 @@
         name="Fabric"
         tool_tip="Click to choose a picture"
         top="10"
-        width="64" />
+        width="64" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
@@ -43,7 +46,10 @@
         name="Color/Tint"
         tool_tip="Click to open Color Picker"
         top="10"
-        width="64" />
+        width="64" >
+         <color_swatch.commit_callback
+             function="ColorSwatch.Commit" />
+       </color_swatch>
        </panel>
 	 <panel
          border="false"
-- 
cgit v1.2.3


From f9a120e8983a72b6de2f146acec55e079255b70e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 28 Apr 2010 17:47:08 +0300
Subject: partial implementation of EXT-6723 Create specialized view of
 inventory for "clothing" accordion tab of outfit editor

- added grouping clothing items by wearable type (shirt, jeans etc.)
- added sorting clothing items by wearing order in groups
- added separators between items of the same wearable type (lists: clothing, body parts)
- added list specific button bars
- partially added dummy items for missing wearable types in the COF (clothing list)

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

--HG--
branch : product-engine
---
 .../xui/en/panel_bodyparts_list_button_bar.xml     | 36 +++++++++++++++++++++
 .../xui/en/panel_clothing_list_button_bar.xml      | 37 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_cof_wearables.xml   |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
new file mode 100644
index 0000000000..9d19b89a61
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<panel
+ follows="left|right|top"
+ height="35"
+ layout="topleft"
+ left="0"
+ name="clothing_list_button_bar_panel"
+ top="0"
+ visible="true"
+ width="300">
+    <button
+     follows="top|left"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     label="Switch"
+     layout="topleft"
+     left="5"
+     name="switch_btn"
+     top="5"
+     width="45" />
+    <button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     label="Shop >" 
+     layout="topleft"
+     right="-5"
+     name="bodyparts_shop_btn"
+     top="5"
+     width="61" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
new file mode 100644
index 0000000000..2359719c2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<panel
+ follows="left|right|top"
+ height="35"
+ layout="topleft"
+ left="0"
+ name="clothing_list_button_bar_panel"
+ top="0"
+ visible="true"
+ width="500">
+    <button
+     follows="top|left"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     is_toggle="true"
+     label="Add +"
+     layout="topleft"
+     left="5"
+     name="add_btn"
+     top="5"
+     width="45" />
+    <button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     label="Shop >" 
+     layout="topleft"
+     right="-5"
+     name="clothing_shop_btn"
+     top="5"
+     width="61" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index 01c7ae61d2..d8a8dbbea4 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -14,6 +14,7 @@
      height="373"
      layout="topleft"
      left="3"
+     single_expansion="true"
      top="0"
      name="cof_wearables_accordion"
      background_visible="true"
-- 
cgit v1.2.3


From e1cf84c9b670e764d39c4152df3ed8c705732735 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 28 Apr 2010 20:08:10 +0300
Subject: Fixed EXT-6550(major) - Edit Outfit: Fix alignment of in-line edit
 button and put proper icon on it

Replaced LLPanelInventoryListItem with LLPanelInventoryListItem. This class is capable of showing widgets on left and right sides of panel.
Implemented LLPanelClothingListItem and LLPanelBodyPartListItem - makes use of new LLPanelInventoryListItem and is able to show buttons specified in tickets. Buttons are
shown on mouse_enter event and hidden on mouse_leave event. Buttons are - delete, move up, move down, lock, edit. It's item's user responsibility
to control buttons visibility.
Made LLInventoryItemsList::addNewItem virtual to allow inheritors create specific(non-default) items.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/325/

--HG--
branch : product-engine
---
 .../default/xui/en/panel_body_parts_list_item.xml  |  73 ++++++++++++++
 .../default/xui/en/panel_clothing_list_item.xml    | 106 +++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_clothing_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
new file mode 100644
index 0000000000..445f677c94
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="wearable_item"
+ top="0"
+ width="380">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="16"
+     follows="top|left"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="0"
+     name="item_icon"
+     top="2"
+     width="16" />
+    <text
+     follows="left|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     allow_html="false"
+     use_ellipses="true"
+     name="item_name"
+     text_color="white"
+     top="4"
+     value="..."
+     width="359" />
+    <button 
+     name="btn_lock"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Lock2"
+     image_selected="Lock2"
+     top="0"
+     left_pad="3"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <button 
+     name="btn_edit"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Icon_Gear_Background"
+     image_selected="Icon_Gear_Background"
+     top="0"
+     left_pad="3"
+     height="20"
+     width="20"
+     tab_stop="false" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
new file mode 100644
index 0000000000..386b3b2c4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="wearable_item"
+ top="0"
+ width="380">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <button 
+     name="btn_delete"
+     layout="topleft"
+     follows="top|left"
+     image_unselected="Toast_CloseBtn"
+     image_selected="Toast_CloseBtn"
+     top="0"
+     left="0"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <icon
+     height="16"
+     follows="top|left"
+     image_name="Inv_Object"
+     layout="topleft"
+     left_pad="3"
+     name="item_icon"
+     top="2"
+     width="16" />
+    <text
+     follows="left|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     allow_html="false"
+     use_ellipses="true"
+     name="item_name"
+     text_color="white"
+     top="4"
+     value="..."
+     width="359" />
+    <button 
+     name="btn_move_up"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Movement_Up_Off"
+     image_selected="Movement_Up_Off"
+     top="0"
+     left="0"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <button 
+     name="btn_move_down"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Movement_Down_Off"
+     image_selected="Movement_Down_Off"
+     top="0"
+     left_pad="3"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <button 
+     name="btn_lock"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Lock2"
+     image_selected="Lock2"
+     top="0"
+     left_pad="3"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <button 
+     name="btn_edit"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Icon_Gear_Background"
+     image_selected="Icon_Gear_Background"
+     top="0"
+     left_pad="3"
+     height="20"
+     width="20"
+     tab_stop="false" />
+</panel>
-- 
cgit v1.2.3


From 4eb741883cbee15e28272677bcb9b58dce85ee42 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 29 Apr 2010 14:55:21 +0300
Subject: Update for EXT-6550(major) - Edit Outfit: Fix alignment of in-line
 edit button and put proper icon on it Replaced 'lock' button with icon.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml | 7 +++----
 indra/newview/skins/default/xui/en/panel_clothing_list_item.xml   | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 445f677c94..4313d450fb 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -48,14 +48,13 @@
      top="4"
      value="..."
      width="359" />
-    <button 
+    <icon 
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_unselected="Lock2"
-     image_selected="Lock2"
+     image_name="Lock2"
      top="0"
-     left_pad="3"
+     left="0"
      height="20"
      width="20"
      tab_stop="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 386b3b2c4f..8dc67de06f 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -81,17 +81,15 @@
      height="20"
      width="20"
      tab_stop="false" />
-    <button 
+    <icon
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_unselected="Lock2"
-     image_selected="Lock2"
+     image_name="Lock2"
      top="0"
      left_pad="3"
      height="20"
-     width="20"
-     tab_stop="false" />
+     width="20" />
     <button 
      name="btn_edit"
      layout="topleft"
-- 
cgit v1.2.3


From 9a054b556ecabdb84957054126d5e4127b7cbc02 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 29 Apr 2010 15:04:29 +0300
Subject: Fixed major bug EXT-7114 (Preferences plain text chat history also
 modifies IM history)

- Changed old label with new one.

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

--HG--
branch : product-engine
---
 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/en')

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 3ef16d2dec..ba967d3e2c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -330,7 +330,7 @@
     <check_box
      enabled="false"
      height="16"
-     label="Enable plain text chat history"
+     label="Enable plain text IM and chat history"
      layout="topleft"
      left_delta="0"
      name="plain_text_chat_history"
-- 
cgit v1.2.3


From 85e3432579844afa8f76b4071329264f85711507 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 29 Apr 2010 16:09:00 +0300
Subject: fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr
 2.0) Added missing 'Delete' button to the Notecard Preview dialog;

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/330/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_preview_notecard.xml        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 14c0081c0d..0e8eef2a21 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -84,8 +84,18 @@
      label="Save"
      label_selected="Save"
      layout="topleft"
-     left="288"
+     left="178"
      name="Save"
      top="332"
      width="100" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Delete"
+     label_selected="Delete"
+     layout="topleft"
+     left="288"
+     name="Delete"
+     top="332"
+     width="100" />
 </floater>
-- 
cgit v1.2.3


From 02d6922727bd674025759a95df15a1f764b784fd Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 29 Apr 2010 19:06:13 +0300
Subject: Fixed EXT-7163(normal) - Create dummy inventory item panel (an item
 panel for unworn wearable types) Added new wearable list item -
 LLPanelDummyClothingListItem for not worn wearable types, it displays grayed
 wearable type icon, grayed title '<clothing type> not worn' and 'add' button.
 Modified base class to be more flexible. Moved init() to protected section.
 Modified COF panel to use dummy item.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/335/

--HG--
branch : product-engine
---
 .../xui/en/panel_dummy_clothing_list_item.xml      | 62 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     | 14 +++++
 2 files changed, 76 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..dbbfa8f2e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="dummy_clothing_item"
+ top="0"
+ width="380">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="16"
+     color="0.75 0.75 0.75 1"
+     follows="top|left"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="20"
+     name="item_icon"
+     top="2"
+     width="16" />
+    <text
+     follows="left|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     allow_html="false"
+     use_ellipses="true"
+     name="item_name"
+     text_color="LtGray_50"
+     top="4"
+     value="..."
+     width="359" />
+    <button 
+     name="btn_add"
+     layout="topleft"
+     follows="top|right"
+     label="+"
+     top="0"
+     left="0"
+     height="20"
+     width="20"
+     tab_stop="false" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3cba76cbfa..e0d58a16c8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1802,6 +1802,20 @@ Clears (deletes) the media and all params from the given face.
 	<string name="alpha">Alpha</string>
 	<string name="tattoo">Tattoo</string>
 	<string name="invalid">invalid</string>
+  
+  <!-- Not Worn Wearable Types -->
+	<string name="shirt_not_worn">Shirt not worn</string>
+	<string name="pants_not_worn">Pants not worn</string>
+	<string name="shoes_not_worn">Shoes not worn</string>
+	<string name="socks_not_worn">Socks not worn</string>
+	<string name="jacket_not_worn">Jacket not worn</string>
+	<string name="gloves_not_worn">Gloves not worn</string>
+	<string name="undershirt_not_worn">Undershirt not worn</string>
+	<string name="underpants_not_worn">Underpants not worn</string>
+	<string name="skirt_not_worn">Skirt not worn</string>
+	<string name="alpha_not_worn">Alpha not worn</string>
+	<string name="tattoo_not_worn">Tattoo not worn</string>
+	<string name="invalid_not_worn">invalid</string>
 
   <!-- Wearable List-->
   <string name="NewWearable">New [WEARABLE_ITEM]</string>
-- 
cgit v1.2.3


From f6feac510dcabeb58d67b35dabf0fe9396bb466d Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 29 Apr 2010 21:22:28 +0300
Subject: Fixed normal bug EXT-7059 (Need to add tool-tip for 'Share' verb
 button on 'People' side panel).

- Added "Share an inventory item" tooltip for button in xml.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 066ea3be6e..7e212c9383 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -490,6 +490,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          label="Share"
          layout="topleft"
          name="share_btn"
+         tool_tip="Share an inventory item"
          width="62" />
         <button
          follows="bottom|left"
-- 
cgit v1.2.3


From c19c7d7d3bd2b36e4e7a50d64e38a97a676b0e80 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 30 Apr 2010 00:45:22 +0300
Subject: Partially implemented normal sub-task EXT-6548 (Edit Outfit: Clean up
 XUI to allow all elements to fit properly in the panel)  - added dummy space
 between buttons. Reviewed by Neal Orman at
 https://codereview.productengine.com/secondlife/r/331/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 73181392c9..a9f588698a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -234,6 +234,14 @@
                  name="move_further_btn"
                  top="1"
                  width="31" />
+                <icon
+                 follows="bottom|left"
+                 height="25"
+                 image_name="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="dummy_icon"
+                 width="105" />
                 <button
                  follows="bottom|right"
                  height="25"
@@ -440,6 +448,22 @@
                  name="add_to_outfit_btn"
                  top="1"
                  width="31" />
+                <icon
+                 follows="bottom|left"
+                 height="25"
+                 image_name="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="dummy_middle_icon"
+                 width="140" />
+                <icon
+                 follows="bottom|left"
+                 height="25"
+                 image_name="Toolbar_Right_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="dummy_right_icon"
+                 width="31" />
             </panel>
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3


From 78eed3fc075049fa100ffe23ab508120977aaaed Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 30 Apr 2010 13:25:48 +0300
Subject: WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers
 connected via PSTN bridge)

Applyied Aimee's patch to enable blocking of avaline caller:
 added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions.
 The caller's ID will change each time so there's no point cluttering up the mute list by persisting them.

Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list,
 so that will need changing to "Avaline Caller 1" etc

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

(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 3cba76cbfa..74dc23853d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2149,10 +2149,11 @@ Clears (deletes) the media and all params from the given face.
   <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>
 
 	<!-- Mute -->
-	<string name="MuteByName">(by name)</string>
+	<string name="MuteByName">(By name)</string>
 	<string name="MuteAgent">(Resident)</string>
-	<string name="MuteObject">(object)</string>
-	<string name="MuteGroup">(group)</string>
+	<string name="MuteObject">(Object)</string>
+	<string name="MuteGroup">(Group)</string>
+	<string name="MuteExternal">(External)</string>
 
 	<!-- Region/Estate Covenant -->
 	<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>
-- 
cgit v1.2.3


From 702efd72ab9e3a2c619b5313b481e0821d453070 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 30 Apr 2010 15:59:23 +0300
Subject: additional patch for EXT-6732 Create specialized view of inventory
 for "clothing" accordion tab of outfit editor

* reimplemented button bars as static panels not as list items (creating accordion - button bar - list view - adaptor/container)
* added management of items' buttons assording to inventory items' states
* assigned actions to clothing/bodyparts items' buttons
* got rid of separators as distinct items and made them as part of items
* removed ad-hoc up/down buttons
* removed "+" button from a button bar

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

--HG--
branch : product-engine
---
 .../default/xui/en/panel_body_parts_list_item.xml  | 12 +++-
 .../default/xui/en/panel_clothing_list_item.xml    | 13 ++++-
 .../skins/default/xui/en/panel_cof_wearables.xml   | 67 +++++++++++++++++-----
 .../xui/en/panel_dummy_clothing_list_item.xml      | 12 +++-
 .../skins/default/xui/en/panel_outfit_edit.xml     | 25 ++++----
 5 files changed, 99 insertions(+), 30 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 4313d450fb..115964e5f2 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="20"
+ height="22"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -69,4 +69,14 @@
      height="20"
      width="20"
      tab_stop="false" />
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.4 0.4 0.4 1.0"
+     bottom="0"
+     follows="left|right|top"
+     height="1"
+     layout="bottomleft"
+     left="0"
+     name="wearable_type_separator_panel"
+     width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 8dc67de06f..7cc9c46c08 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="20"
+ height="23"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -101,4 +101,15 @@
      height="20"
      width="20"
      tab_stop="false" />
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.4 0.4 0.4 1.0"
+     bottom="0"
+     follows="left|right|top"
+     height="1"
+     layout="bottomleft"
+     left="0"
+     name="wearable_type_separator_panel"
+     visible="false"
+     width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d8a8dbbea4..e13847e412 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -3,7 +3,6 @@
  background_visible="true"
  bg_alpha_color="DkGray"
  border="false"
- bottom="0"
  follows="all"
  height="200"
  left="0"
@@ -11,7 +10,7 @@
  width="313">
     <accordion
      follows="all"
-     height="373"
+     height="200"
      layout="topleft"
      left="3"
      single_expansion="true"
@@ -27,7 +26,7 @@
             <flat_list_view
              allow_select="true"
              follows="all"
-             height="150"
+             height="10"
              layout="topleft"
              left="0"
              name="list_attachments"
@@ -38,29 +37,71 @@
          layout="topleft"
          name="tab_clothing"
          title="Clothing">
-            <flat_list_view
-             allow_select="true"
+            
+            <!-- *NOTE there should be no any gaps between the button bar and the list - 
+            accordiong-list adaptor won't employ them while calculating new height when the size of the list changes -->
+            <panel
+             background_visible="false"
+             class="accordion_list_adaptor"
              follows="all"
-             height="150"
+             height="45"
              layout="topleft"
              left="0"
-             name="list_clothing"
+             name="button_bar_adaptor"
              top="0"
-             width="307" />
+             width="307">
+                <panel
+                 bevel="none"
+                 filename="panel_clothing_list_button_bar.xml"
+                 height="35"
+                 name="button_bar"
+                 top="0"
+                 width="307" />
+                <flat_list_view
+                 allow_select="true"
+                 follows="all"
+                 height="10"
+                 layout="topleft"
+                 left="0"
+                 name="list_clothing"
+                 top_pad="0"
+                 width="307" />
+            </panel>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
          name="tab_body_parts"
          title="Body Parts">
-            <flat_list_view
-             allow_select="true"
+
+            <!-- *NOTE there should be no any gaps between the button bar and the list - 
+            accordiong-list adaptor won't employ them while calculating new height when the size of the list changes -->
+            <panel
+             background_visible="false"
+             class="accordion_list_adaptor"
              follows="all"
-             height="150"
+             height="45"
              layout="topleft"
              left="0"
-             name="list_body_parts"
+             name="button_bar_adaptor"
              top="0"
-             width="307" />
+             width="307">
+                <panel 
+                 bevel="none"
+                 filename="panel_bodyparts_list_button_bar.xml" 
+                 height="35"
+                 name="button_bar"
+                 top="0"
+                 width="307"/>
+                <flat_list_view
+                 allow_select="true"
+                 follows="all"
+                 height="10"
+                 layout="topleft"
+                 left="0"
+                 name="list_body_parts"
+                 top_pad="0"
+                 width="307" />
+            </panel>
         </accordion_tab>
     </accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index dbbfa8f2e2..c5a60ced88 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="20"
+ height="22"
  layout="topleft"
  left="0"
  name="dummy_clothing_item"
@@ -59,4 +59,14 @@
      height="20"
      width="20"
      tab_stop="false" />
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.4 0.4 0.4 1.0"
+     bottom="0"
+     follows="left|right|top"
+     height="1"
+     layout="bottomleft"
+     left="0"
+     name="wearable_type_separator_panel"
+     width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index a9f588698a..1da9304f03 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -130,7 +130,7 @@
      animate="false"
      default_tab_group="2"
      follows="all"
-     height="470"
+     height="450"
      width="300"
      layout="topleft"
      orientation="vertical"
@@ -140,8 +140,7 @@
      left="5">
         <layout_panel
          layout="topleft"
-         follows="left|top|right"
-         height="220"
+         height="225"
          label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
@@ -151,27 +150,26 @@
 
             <!-- List containing items from the COF and Base outfit -->
             <panel
-             background_visible="false"
              class="cof_wearables"
              filename="panel_cof_wearables.xml"
              follows="left|top|right|bottom"
-             height="193"
+             height="198"
              layout="topleft"
              left="0"
              name="cof_wearables_list"
              top="0"
              width="300" /> 
 
-          <panel
+            <panel
              background_visible="true"
              bevel_style="none"
+             bottom="0"
              follows="bottom|left|right"
              height="27"
              label="bottom_panel"
-             layout="topleft"
+             layout="bottomleft"
              left="0"
              name="edit_panel"
-             top_pad="0"
              width="300">
                 <button
                  follows="bottom|left"
@@ -186,11 +184,10 @@
                  top="1"
                  width="31" />
                 <button
-                 is_toggle="true"
                  follows="bottom|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
+                 image_overlay=""
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -214,7 +211,7 @@
                  follows="bottom|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Forward_On"
+                 image_overlay=""
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -226,7 +223,7 @@
                  follows="bottom|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Backward_On"
+                 image_overlay=""
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -261,8 +258,8 @@
         <layout_panel
          auto_resize="true"
          default_tab_group="3"
-         height="210" 
-         min_height="210"
+         height="225" 
+         min_height="225"
          name="add_wearables_panel"
          width="300"
          tab_group="2"
-- 
cgit v1.2.3


From 5078f522b14d87c6c4adf97f93004b8610bb8e9b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 30 Apr 2010 16:04:20 +0300
Subject: Done normal task EXT-6248 (3 different viewer 2 speakers lists are
 all inconsistent)

Turned on "show info button" for lists in group & ad-hoc chats.

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_group_control_panel.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_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 28a6995186..e70abc0975 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -37,7 +37,7 @@
              layout="topleft"
              name="speakers_list"
              opaque="false"
-             show_info_btn="false"
+             show_info_btn="true"
              show_profile_btn="false"
              show_speaking_indicator="false"
              width="147" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index aa7d621e4c..c1dc2aaaf7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -36,7 +36,7 @@
              layout="topleft"
              name="speakers_list"
              opaque="false"
-             show_info_btn="false"
+             show_info_btn="true"
              show_profile_btn="false"
              show_speaking_indicator="false"
              width="145" />
-- 
cgit v1.2.3


From 66e407c1ca9287796e6588ae1df3304c7ac87b98 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 30 Apr 2010 17:04:24 +0300
Subject: Completed task EXT-6548 (Edit Outfit: correct XUI: update status
 string, add t-shirt icon etc.).

- Removed temporary "up", "down", "new" buttons.
- Fixed misc positions/dimensions/fonts/colors/images.

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_cof_wearables.xml   |  15 ++-
 .../skins/default/xui/en/panel_outfit_edit.xml     | 109 +++++++++------------
 .../skins/default/xui/en/sidepanel_appearance.xml  |   2 +-
 3 files changed, 52 insertions(+), 74 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d8a8dbbea4..f878dd0b19 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -3,23 +3,22 @@
  background_visible="true"
  bg_alpha_color="DkGray"
  border="false"
- bottom="0"
  follows="all"
- height="200"
+ height="373"
  left="0"
  name="cof_wearables"
- width="313">
+ width="311">
     <accordion
      follows="all"
      height="373"
      layout="topleft"
-     left="3"
+     left="0"
      single_expansion="true"
      top="0"
      name="cof_wearables_accordion"
      background_visible="true"
      bg_alpha_color="DkGray2"
-     width="307">
+     width="311">
         <accordion_tab
          layout="topleft"
          name="tab_attachments"
@@ -32,7 +31,7 @@
              left="0"
              name="list_attachments"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -46,7 +45,7 @@
              left="0"
              name="list_clothing"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -60,7 +59,7 @@
              left="0"
              name="list_body_parts"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
     </accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 73181392c9..bf554217a6 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -69,19 +69,21 @@
 
 <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
     <panel
+     background_visible="true"
+     bg_alpha_color="DkGray2"
      bevel_style="none"
      follows="top|left|right"
-     height="45"
+     height="40"
      label="bottom_panel"
      layout="topleft"
-     left="5"
+     left="6"
      name="header_panel"
      top_pad="5" 
-     width="300">
+     width="311">
         <icon
          follows="left|top"
          height="40"
-         image_name="t-shirt-image"
+         image_name="TabIcon_Appearance_Off"
          left="2"
          mouse_opaque="false"
          name="outfit_icon"
@@ -92,35 +94,35 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="40"
+             height="38"
              label="bottom_panel"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="outfit_name_and_status"
              top="2"
-             width="200">
+             width="270">
                 <text
                  follows="top|left|right"
-                 font="SansSerif"
+                 font="SansSerifSmallBold"
                  height="13"
                  layout="topleft"
                  name="status"
-                 text_color="Green"
-                 top="0"
-                 value="Editing..."
+                 text_color="EmphasisColor"
+                 top="2"
+                 value="Now editing..."
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
                 <text
                  follows="bottom|left|right"
-                 font="SansSerifHugeBold"
+                 font="SansSerifLargeBold"
                  height="26"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
-                 top_pad="0"
+                 top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
             </panel>
     </panel>
 
@@ -130,22 +132,22 @@
      animate="false"
      default_tab_group="2"
      follows="all"
-     height="470"
-     width="300"
+     height="495"
+     width="313"
      layout="topleft"
      orientation="vertical"
      name="im_panels"
      tab_group="1"
-     top_pad="10"
+     top_pad="5"
      left="5">
         <layout_panel
          layout="topleft"
-         follows="left|top|right"
+         follows="all"
          height="220"
          label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
-         width="300"
+         width="313"
          auto_resize="true"
          user_resize="true">
 
@@ -157,10 +159,10 @@
              follows="left|top|right|bottom"
              height="193"
              layout="topleft"
-             left="0"
+             left="1"
              name="cof_wearables_list"
              top="0"
-             width="300" /> 
+             width="311" />
 
           <panel
              background_visible="true"
@@ -171,8 +173,8 @@
              layout="topleft"
              left="0"
              name="edit_panel"
-             top_pad="0"
-             width="300">
+             top="193"
+             width="313">
                 <button
                  follows="bottom|left"
                  height="25"
@@ -198,49 +200,22 @@
                  name="add_btn"
                  top="1"
                  width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="new_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Forward_On"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_closer_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Backward_On"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_further_btn"
-                 top="1"
-                 width="31" />
+		        <icon
+		         follows="bottom|left|right"
+		         height="25"
+		         image_name="Toolbar_Middle_Off"
+		         layout="topleft"
+		         left_pad="1"
+		         name="dummy_icon"
+		         width="216"
+		         />
                 <button
                  follows="bottom|right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="TrashItem_Off"
                  image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Right_Off"
                  layout="topleft"
                  name="remove_from_outfit_btn"
                  right="-1"
@@ -256,7 +231,7 @@
          height="210" 
          min_height="210"
          name="add_wearables_panel"
-         width="300"
+         width="313"
          tab_group="2"
          user_resize="true"
          visible="false">
@@ -449,7 +424,7 @@
      height="30"
      layout="topleft"
      left="5"
-     top_pad="10"
+     top_pad="2"
      name="save_revert_button_bar"
      width="300">
         <button
@@ -459,14 +434,17 @@
          left="0"
          layout="topleft"
          name="save_btn"
-         width="145" />
+         top="0"
+         width="155" />
         <button
          follows="bottom|right"
          height="23"
          name="save_flyout_btn"
          label=""
+         layout="topleft"
          left_pad="-20"
          tab_stop="false"
+         top="0"
          image_selected="SegmentedBtn_Right_Selected_Press"
          image_unselected="SegmentedBtn_Right_Off"
          image_pressed="SegmentedBtn_Right_Press"
@@ -476,10 +454,11 @@
         <button
          follows="bottom|left|right"
          height="23"
-         left_pad="15"
+         left_pad="13"
          label="Revert"
          layout="topleft"
          name="revert_btn"
+         top="0"
          width="145" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 73650a19dc..00b3328bde 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -106,7 +106,7 @@ width="333">
    <panel
    class="panel_outfit_edit"
    filename="panel_outfit_edit.xml"
-   height="550"
+   height="565"
    follows="all"
    layout="topleft"
    left="5"
-- 
cgit v1.2.3


From ccd4215fd4292ed34d68dd7be2c2cc2de92addcc Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 30 Apr 2010 19:55:00 +0300
Subject: Implemented task EXT-6559 (Appearance panel: Add edit button in place
 of the image display next to current look).

- Changed the topmost part of the Appearance panel:
  * Added new "Edit current outfit" button.
  * Implemented COF status display (unsaved/wearing) according to the spec.
  * Minor XUI changes (font / dimensions / bg color).
- Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel.
- Removed the temporary "ShowDebugAppearanceEditor" setting.

TODO: use icons from the spec (currently missing).

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/339/

--HG--
branch : product-engine
---
 .../default/xui/en/panel_outfits_inventory.xml     | 25 +++----
 .../skins/default/xui/en/sidepanel_appearance.xml  | 84 ++++++++++++++--------
 2 files changed, 61 insertions(+), 48 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 b8ad278da7..9e59651bd1 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -5,7 +5,7 @@
  background_opaque="true"
  background_visible="true"
   follows="all"
- height="570"
+ height="575"
  label="Things"
  layout="topleft"
  min_height="350"
@@ -14,7 +14,7 @@
  border="false">
    <tab_container
      follows="all"
-     height="501"
+     height="509"
      layout="topleft"
      left="7"
      name="appearance_tabs"
@@ -22,6 +22,7 @@
      tab_height="30"
      tab_position="top"
      halign="center"
+     top="8"
      width="312">
          <panel
            class="outfits_list"
@@ -50,8 +51,8 @@
    </tab_container>
 	 <panel
        background_visible="true"
-	  follows="bottom|left"
-	  height="73"
+	  follows="bottom|left|right"
+	  height="57"
 	  layout="topleft"
 	  left="9"
 	  top_pad="-1"
@@ -72,7 +73,7 @@
          top="1"
          width="31" />
      <icon
-      follows="bottom|left"
+      follows="bottom|left|right"
       height="25"
       image_name="Toolbar_Middle_Off"
       layout="topleft"
@@ -82,7 +83,7 @@
         />
 
         <dnd_button
-         follows="bottom|left"
+         follows="bottom|right"
          height="25"
          image_hover_unselected="Toolbar_Right_Over"
           image_overlay="TrashItem_Off"
@@ -104,7 +105,7 @@
        left="0"
       width="153" />
      <button
-      follows="bottom|right" 
+      follows="bottom|left|right" 
       height="23" 
       label="Wear"
       layout="topleft"
@@ -112,16 +113,6 @@
       left_pad="3"
       tool_tip="Wear selected outfit"
       width="152" />
-	 <button
-	  follows="bottom|left"
-		height="23" 
-		label="Edit Outfit" 
-		layout="topleft"
-        right="-140"
-		name="edit_current_outfit_btn"
-        top="26"
-        visible="false" 
-		width="50" />
 	 </panel>
        
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 00b3328bde..e74c70789f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -15,63 +15,85 @@ width="333">
    <string
    name="No Outfit"
    value="No Outfit" />
+   <string
+   name="Unsaved Changes"
+   value="Unsaved changes" />
+   <string
+   name="Now Wearing"
+   value="Now wearing..." />
    <panel
-   left="0"
-   top="0"
-   follows="all"
+   background_opaque="true"
+   background_visible="true"
+   bg_opaque_color="DkGray2"
+   left="10"
+   top="5"
+   follows="left|top|right"
    layout="topleft"
-   width="330"
+   width="303"
    height="33"
    name="panel_currentlook"
    >
       <button
       follows="left|top"
-      top="0"  width="1" height="1"
+      left="205" top="7" width="20" height="20"
+      label="E"
       layout="topleft"
-      left="0"
-      name="editappearance_btn" />
+      name="editappearance_btn"
+      visible="false" />
       <button
       follows="left|top"
-      top="0"  width="1" height="1"
+      left="235" top="7" width="20" height="20"
+      label="O"
       layout="topleft"
-      left="0"
-      name="openoutfit_btn" />
+      name="openoutfit_btn"
+      visible="false" />
       <icon
       follows="top|left"
-      height="24"
+      height="32"
       image_name="TabIcon_Appearance_Off"
       name="outfit_icon"
       mouse_opaque="false"
       visible="true"
-      left="9"
+      left="0"
       top="0"
-      width="24" />
+      width="32" />
       <text
-      font="SansSerifHugeBold"
+      font="SansSerifSmallBold"
+      text_color="EmphasisColor"
+      width="300"
+      height="10"
+      follows="top|left"
+      layout="topleft"
+      left="35"
+      top="3"
+      mouse_opaque="false"
+      name="currentlook_status" >
+      (Status)
+      </text>
+      <text
+      font="SansSerifLargeBold"
       height="20"
-      left_pad="5"
-      text_color="LtGray"
-      top="0"
+      left="35"
+      text_color="White"
+      top="15"
       use_ellipses="true"
-      width="305"
+      width="230"
       follows="top|left"
-      word_wrap="true"
+      word_wrap="false"
       mouse_opaque="false"
       name="currentlook_name">
       MyOutfit With a really Long Name like MOOSE
       </text>
-      <text
-      font="SansSerifSmall"
-      text_color="White_50"
-      width="300"
-      height="1"
-      follows="top|left"
+      <button
+      follows="left|top"
+      height="20"
+      image_overlay="windows/Icon_Gear_Over.png"
+      label=""
       layout="topleft"
-      top_pad="5"
-      mouse_opaque="false"
-      name="currentlook_title" >
-      (unsaved)
-       </text>
+      left="265"
+      name="edit_outfit_btn"
+      top="7"
+      width="30" />
    </panel>
    <filter_editor
    height="23"
@@ -87,7 +109,7 @@ width="333">
    class="panel_outfits_inventory"
    filename="panel_outfits_inventory.xml"
    name="panel_outfits_inventory"
-   height="505"
+   height="493"
    min_height="410"
    width="320"
    left="0"
-- 
cgit v1.2.3


From 8daf25b65c30f58889ed5923d43bf785cb758026 Mon Sep 17 00:00:00 2001
From: "Karl Stiefvater (qarl)" <qarl@lindenlab.com>
Date: Mon, 3 May 2010 15:23:45 -0500
Subject: EXT-6775 Remove support for full-screen mode in Viewer 2.  reviewed
 by davep.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ---------
 1 file changed, 9 deletions(-)

(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 df4f33adf0..eefcabdd39 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1565,15 +1565,6 @@
                 <menu_item_call.on_click
                  function="View.ZoomOut" />
             </menu_item_call>
-            <menu_item_separator/>
-            <menu_item_call
-             label="Toggle Fullscreen"
-             name="Toggle Fullscreen"
-             >
-               <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
-                <menu_item_call.on_click
-                 function="View.Fullscreen" />
-            </menu_item_call>
         </menu>
         <menu_item_separator/>
         <menu_item_call
-- 
cgit v1.2.3


From 15413e44427c5cc332bcae65462498b349d15eba Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 5 May 2010 12:29:53 +0300
Subject: Fixed major bug EXT-6797 (attempting to create new folder while
 viewing recent inventory renames newest item instead.)

Implemented Recent Inventory Panel specific classes to create appropriate context menu for Folders in Recent Items Panel:
 * Registered new LLInventoryRecentItemsPanel class
 * Added appropriate Folder Bridge and Bridge Builder

Updated main inventory panel to not show "+" button on Recent Items tab
 * Placed controls into Layout Stack.
 * Change visibility of panel with "+" button while switching between tabs.
 * also made bottom panel wider to be consistent with other side panels (see screenshots).

Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/334/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_main_inventory.xml  | 140 +++++++++++++--------
 1 file changed, 86 insertions(+), 54 deletions(-)

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

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 46625144e1..d65b86f007 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -84,7 +84,7 @@
      sort_order_setting="InventorySortOrder"
      top="16"
      width="288" />
-    <inventory_panel
+    <recent_inventory_panel
         bg_opaque_color="DkGray2"
    bg_alpha_color="DkGray2"
    background_visible="true"
@@ -100,62 +100,94 @@
      name="Recent Items"
      width="290" />
   </tab_container>
-
-  <panel
-     background_visible="true"
+  <layout_stack
+   animate="false"
+   background_visible="true"
    bevel_style="none"
+   border_size="0"
    follows="left|right|bottom"
-   height="27"
+   height="25"
    layout="topleft"
-   top_pad="-1"
+   orientation="horizontal"
+   top_pad="0"
    left="10"
    name="bottom_panel"
-   width="310">
-    <button
-     follows="bottom|left"
-     tool_tip="Show additional options"
-     height="25"
-     image_hover_unselected="Toolbar_Left_Over"
-     image_overlay="OptionsMenu_Off"
-     image_selected="Toolbar_Left_Selected"
-     image_unselected="Toolbar_Left_Off"
-     layout="topleft"
-     left="0"
-     name="options_gear_btn"
-     top="1"
-     width="31" />
-    <button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_overlay="AddItem_Off"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="add_btn"
-     tool_tip="Add new item"
-     width="31" />
-    <icon
-     follows="bottom|left"
-     height="25"
-     image_name="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="dummy_icon"
-     width="209"
-       />
-    <dnd_button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Right_Over"
-     image_overlay="TrashItem_Off"
-     image_selected="Toolbar_Right_Selected"
-     image_unselected="Toolbar_Right_Off"
-     left_pad="1"
-     layout="topleft"
-     name="trash_btn"
-     tool_tip="Remove selected item"
-     width="31"/>
-  </panel>
+   width="307">
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="options_gear_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           tool_tip="Show additional options"
+           height="25"
+           image_hover_unselected="Toolbar_Left_Over"
+           image_overlay="OptionsMenu_Off"
+           image_selected="Toolbar_Left_Selected"
+           image_unselected="Toolbar_Left_Off"
+           layout="topleft"
+           left="0"
+           name="options_gear_btn"
+           top="0"
+           width="31" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="add_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="AddItem_Off"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="add_btn"
+           tool_tip="Add new item"
+           top="0"
+           width="31" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="true"
+       height="25"
+       layout="topleft"
+       name="dummy_panel"
+       width="212">
+          <icon
+           follows="bottom|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           top="0"
+           name="dummy_icon"
+           width="211" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="trash_btn_panel"
+       width="31">
+          <dnd_button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Right_Over"
+           image_overlay="TrashItem_Off"
+           image_selected="Toolbar_Right_Selected"
+           image_unselected="Toolbar_Right_Off"
+           left="0"
+           layout="topleft"
+           name="trash_btn"
+           tool_tip="Remove selected item"
+           top="0"
+           width="31"/>
+      </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From d39ef5ce6fd52a66189e3e14da3a01b14b1d99a2 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 5 May 2010 13:19:24 +0300
Subject: Implemented task EXT-7156 (Appearance panel: "Wear" button should
 become disabled and a loading indicator should appear next to the outfit
 name).

When user presses the "Wear" button in the outfits list, we disable the button and display a perpetual loading indicator until all wearables of the outfit being worn get loaded.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/347/

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

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index e74c70789f..6a3c148456 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -94,6 +94,14 @@ width="333">
       name="edit_outfit_btn"
       top="7"
       width="30" />
+      <loading_indicator
+      follows="left|top"
+      height="24"
+      layout="topleft"
+      left="268"
+      name="wearables_loading_indicator"
+      top="6"
+      width="24" />
    </panel>
    <filter_editor
    height="23"
-- 
cgit v1.2.3


From 815b350b6d596e5f24f6cae74f85c7e85e9b8eb3 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 5 May 2010 14:13:21 +0300
Subject: implemented task EXT-6274 Feature Request: Add button to Group Notice
 form to open secondary Inventory floater

Added inventory toggle button to panel_group_notices.xml
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/348

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_group_notices.xml       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 479629f6ea..19fe2ea874 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -207,12 +207,26 @@ Maximum 200 per group daily
          name="drop_icon"
          top_delta="-10"
          width="72" />
+        <button
+         follows="left|top"
+         layout="topleft"
+         left="20"
+         top_delta="50"
+         height="23"
+         width="100"
+         name="open_inventory"
+         label="Inventory"
+         tool_tip="Open Inventory">
+			<button.init_callback
+				 function="Button.SetFloaterToggle"
+				 parameter="inventory"/>
+		</button>
         <button
          follows="left|top"
          layout="topleft"
          left="140"
          name="remove_attachment"
-         top_delta="50"
+         top_delta="0"
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
@@ -230,7 +244,7 @@ Maximum 200 per group daily
          name="send_notice"
          width="100" />
       <group_drop_target
-         height="95"
+         height="75"
          top="160"
          left="10"
          layout="topleft"
-- 
cgit v1.2.3


From f73f2c410e12abc2ccf3e0ae2719111cb285962a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 5 May 2010 17:03:07 +0300
Subject: Just reformatting xml file with Preview Tool. Trivial, not reviewed.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_participant_list.xml | 198 ++++++++++-----------
 1 file changed, 99 insertions(+), 99 deletions(-)

(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 2515b60868..6a90e92eca 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -6,31 +6,31 @@
      label="Sort by Name"
      layout="topleft"
      name="SortByName">
-        <menu_item_check.on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_name" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_sorted_by_name" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_name" />
     </menu_item_check>
     <menu_item_check
      label="Sort by Recent Speakers"
      layout="topleft"
      name="SortByRecentSpeakers">
-        <menu_item_check.on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_recent_speakers" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_sorted_by_recent_speakers" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_recent_speakers" />
     </menu_item_check>
     <menu_item_call
      label="View Profile"
      layout="topleft"
      name="View Profile">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Profile" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_view_profile" />
     </menu_item_call>
@@ -38,9 +38,9 @@
      label="Add Friend"
      layout="topleft"
      name="Add Friend">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.AddFriend" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_add" />
     </menu_item_call>
@@ -48,9 +48,9 @@
      label="IM"
      layout="topleft"
      name="IM">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.IM" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_im" />
     </menu_item_call>
@@ -58,20 +58,19 @@
      label="Call"
      layout="topleft"
      name="Call">
-         <menu_item_call.on_click
+        <on_click
          function="Avatar.Call" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_call" />
     </menu_item_call>
     <menu_item_call
-     enabled="true"
      label="Share"
      layout="topleft"
      name="Share">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Share" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_share" />
     </menu_item_call>
@@ -79,37 +78,38 @@
      label="Pay"
      layout="topleft"
      name="Pay">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Pay" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_pay" />
     </menu_item_call>
     <menu_item_separator
-        layout="topleft"
-        name="View Icons Separator" />
+     layout="topleft"
+     name="View Icons Separator" />
     <menu_item_check
-        label="View People Icons"
-        name="View Icons">
-      <on_click
-          function="ToggleControl"
-          parameter="ParticipantListShowIcons"/>
-      <on_check
-          function="CheckControl"
-          parameter="ParticipantListShowIcons" />
+     label="View People Icons"
+     layout="topleft"
+     name="View Icons">
+        <on_check
+         function="CheckControl"
+         parameter="ParticipantListShowIcons" />
+        <on_click
+         function="ToggleControl"
+         parameter="ParticipantListShowIcons" />
     </menu_item_check>
     <menu_item_separator
-        layout="topleft" />
+     layout="topleft" />
     <menu_item_check
      label="Block Voice"
      layout="topleft"
      name="Block/Unblock">
-        <menu_item_check.on_click
-         function="Avatar.BlockUnblock" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_blocked" />
-        <menu_item_check.on_enable
+        <on_click
+         function="Avatar.BlockUnblock" />
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_block" />
     </menu_item_check>
@@ -126,71 +126,71 @@
          function="ParticipantList.EnableItem"
          parameter="can_mute_text" />
     </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+    <menu_item_separator
+     layout="topleft" />
     <context_menu
      label="Moderator Options &gt;"
      layout="topleft"
-     name="Moderator Options" >
-    <menu_item_check
-     label="Allow text chat"
-     layout="topleft"
-     name="AllowTextChat">
-        <on_check
-         function="ParticipantList.CheckItem"
-         parameter="is_allowed_text_chat" />
-        <on_click
-         function="ParticipantList.ToggleAllowTextChat" />
-        <on_enable
-         function="ParticipantList.EnableItem"
-         parameter="can_allow_text_chat" />
-    </menu_item_check>
-    <menu_item_separator
-     layout="topleft"
-     name="moderate_voice_separator" />
-    <menu_item_call
-     label="Mute this participant"
-     layout="topleft"
-     name="ModerateVoiceMuteSelected">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="selected" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Mute everyone else"
-     layout="topleft"
-     name="ModerateVoiceMuteOthers">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="others" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Unmute this participant"
-     layout="topleft"
-     name="ModerateVoiceUnMuteSelected">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="selected" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Unmute everyone else"
-     layout="topleft"
-     name="ModerateVoiceUnMuteOthers">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="others" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
+     name="Moderator Options">
+        <menu_item_check
+         label="Allow text chat"
+         layout="topleft"
+         name="AllowTextChat">
+            <on_check
+             function="ParticipantList.CheckItem"
+             parameter="is_allowed_text_chat" />
+            <on_click
+             function="ParticipantList.ToggleAllowTextChat" />
+            <on_enable
+             function="ParticipantList.EnableItem"
+             parameter="can_allow_text_chat" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft"
+         name="moderate_voice_separator" />
+        <menu_item_call
+         label="Mute this participant"
+         layout="topleft"
+         name="ModerateVoiceMuteSelected">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="selected" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Mute everyone else"
+         layout="topleft"
+         name="ModerateVoiceMuteOthers">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="others" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Unmute this participant"
+         layout="topleft"
+         name="ModerateVoiceUnMuteSelected">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="selected" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Unmute everyone else"
+         layout="topleft"
+         name="ModerateVoiceUnMuteOthers">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="others" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
     </context_menu>
 </context_menu>
-- 
cgit v1.2.3


From 00360bb1cd28715e2b55b8d92db690a2e3d872e2 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 6 May 2010 10:09:24 +0300
Subject: EXT-7097 FIXED Replaced usage usage of "ObjectGiveItemUnknownUser"
 notification with functionality provided by LLPostponedNotification class;
 reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/345/

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/notifications.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4479a3dd4d..10914285dd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5086,28 +5086,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC
     </form>
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="ObjectGiveItemUnknownUser"
-   type="offer">
-An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
-    <form name="form">
-      <button
-       index="0"
-       name="Keep"
-       text="Keep"/>
-      <button
-       index="1"
-       name="Discard"
-       text="Discard"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Block"/>
-    </form>
-  </notification>
-
   <notification
    icon="notify.tga"
    name="UserGiveItem"
-- 
cgit v1.2.3


From a8c54b9bb35ae5b5210f5b80a1a8732f211aea2a Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 6 May 2010 11:32:58 +0300
Subject: EXT-6894 [TRUNCATION] (multiple langs) Side Panel > People (tab) >
 Friends tab > Teleport button truncated

- Changed buttons width in EN and PT locales

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7e212c9383..b79ef1e287 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -464,7 +464,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="view_profile_btn"
          tool_tip="Show picture, groups, and other Residents information"
          top="0"
-         width="70" />
+         width="67" />
         <button
          follows="bottom|left"
          left_pad="3"
@@ -473,7 +473,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          layout="topleft"
          name="im_btn"
          tool_tip="Open instant message session"
-         width="43" />
+         width="40" />
         <button
          follows="bottom|left"
          left_pad="3"
@@ -491,7 +491,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          layout="topleft"
          name="share_btn"
          tool_tip="Share an inventory item"
-         width="62" />
+         width="65" />
         <button
          follows="bottom|left"
          left_pad="3"
-- 
cgit v1.2.3


From ddd4878668cbd6ae24c2be0617e26120d38b0be9 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 6 May 2010 11:33:37 +0300
Subject: EXT-6599 Remove separator from Me->My Status

- Removed separator from Me->My Status

Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/353/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 -
 1 file changed, 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 eefcabdd39..e0d8926d4a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -90,7 +90,6 @@
                 <menu_item_call.on_click
                  function="World.SetAway" />
             </menu_item_call>
-          <menu_item_separator/>
             <menu_item_call
              label="Busy"
              name="Set Busy">
-- 
cgit v1.2.3


From 0674dd9bd9d808658158a91a9cedf1b3e274c094 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 6 May 2010 15:36:49 +0300
Subject: EXT-6273 FIXED Changed menu item label

- Changed menu item's label of 'viewer menu' and 'login viewer menu'

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_login.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.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/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index e95300a4b3..9fac296e26 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -22,7 +22,7 @@
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
-         label="Quit [APP_NAME]"
+         label="Exit [APP_NAME]"
          name="Quit"
          shortcut="control|Q">
             <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e0d8926d4a..c9ebeb60fb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -115,7 +115,7 @@
         </menu_item_call>
         <menu_item_separator/>
         <menu_item_call
-         label="Quit [APP_NAME]"
+         label="Exit [APP_NAME]"
          name="Quit"
          shortcut="control|Q">
             <menu_item_call.on_click
-- 
cgit v1.2.3


From 17b42d5c5e0577cfcb59dc8972ddee602938d419 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 6 May 2010 19:52:56 +0300
Subject: EXT-6102 FIXED Add custom view for world rect with special reshape
 processing reviwed Mike Antipov at
 https://codereview.productengine.com/secondlife/r/357/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml               |  2 +-
 .../skins/default/xui/en/panel_preferences_advanced.xml        | 10 ++++++++++
 2 files changed, 11 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 b2e4a7ad95..e42b88abc3 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -50,7 +50,7 @@
                name="non_side_tray_view"
                user_resize="false"
                width="500">
-          <view bottom="500"
+          <world_view bottom="500"
                 follows="all"
                 height="500"
                 left="0"
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 69e8e6fdcc..0129d97616 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -93,6 +93,16 @@ Automatic position for:
      layout="topleft"
      name="appearance_camera_movement"
      tool_tip="Use automatic camera positioning while in edit mode"
+     width="242" />
+    <check_box
+     control_name="SidebarCameraMovement"
+     follows="left|top"
+     height="16"
+     initial_value="1"
+     label="Sidebar"
+     layout="topleft"
+     name="appearance_sidebar_positioning"
+     tool_tip="Use automatic camera positioning for sidebar"
      width="242" />
      	<icon
 	 follows="left|top"
-- 
cgit v1.2.3


From 183122bc1dae8832c3dd728bfe76144165a0d2d7 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 7 May 2010 13:44:03 -0400
Subject: EXT-7269 : FIXED : Issue warning dialog when item is deleted that has
 links pointing to it

Warning now comes up if you try to delete an item that has any item links pointing to it (in memory).  This assumes that the viewer actually knows about those links, which is true at least in 2.0 since links only appear in Outfits folders and this code causes those to be fetched into memory on startup.
---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 10914285dd..149a254f49 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2122,6 +2122,19 @@ Price to pay for listing must be at least L$[MIN_PRICE].
 Please enter a higher price.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmItemDeleteHasLinks"
+   type="alertmodal">
+At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmObjectDeleteLock"
-- 
cgit v1.2.3


From 73e6407af8f802bbc4a3932bc5ac32ca8f13ab56 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 7 May 2010 22:07:01 +0300
Subject: EXT-2493 FIXED Added strafe buttons.

- Added slide left and Move right buttons to movement actions panel, when inserting them in xml organized buttons in panel into 3 columns to make their position more easily configurable.

- Removed hiding of fly up and down buttons. When not flying(in walk/run mode) they act as jump ans crouch.

- Added movement mode(walk/run/fly) dependent tooltips for fly/jump/crouch and slide buttons.

- Added comment regarding implementation of move floater buttons toggling when user moves via keyboard (because it's not quite obvious and time consuming when you first encounter it) to LLFloaterMove::postBuild().

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_moveview.xml      | 146 +++++++++++++++------
 .../default/xui/en/panel_stand_stop_flying.xml     |   6 +-
 2 files changed, 112 insertions(+), 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 8e2c57764b..a685094190 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -13,7 +13,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
- width="115">
+ width="113">
     <string
      name="walk_forward_tooltip">
         Walk Forward (press Up Arrow or W)
@@ -22,6 +22,14 @@
      name="walk_back_tooltip">
         Walk Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_left_tooltip">
+        Walk left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="walk_right_tooltip">
+        Walk right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="run_forward_tooltip">
         Run Forward (press Up Arrow or W)
@@ -30,6 +38,14 @@
      name="run_back_tooltip">
         Run Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="run_left_tooltip">
+        Run left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="run_right_tooltip">
+        Run right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="fly_forward_tooltip">
         Fly Forward (press Up Arrow or W)
@@ -38,6 +54,30 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="fly_left_tooltip">
+        Fly left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="fly_right_tooltip">
+        Fly right (press Shift + Right Arrow or D)
+    </string>
+    <string
+     name="fly_up_tooltip">
+        Fly up (press E)
+    </string>
+    <string
+     name="fly_down_tooltip">
+        Fly down (press C)
+    </string>
+    <string
+     name="jump_tooltip">
+        Jump (press E)
+    </string>
+    <string
+     name="crouch_tooltip">
+        Crouch (press C)
+    </string>
     <string
      name="walk_title">
         Walk
@@ -59,59 +99,91 @@
      mouse_opaque="false"
      name="panel_actions"
      top="0"
-     width="115">
+     width="113">
+        <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad-->
+        <!-- Left column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
+         image_selected="Movement_Up_On"
+         image_pressed_selected="Movement_Up_On"
+         image_unselected="Movement_Up_Off"
+         layout="topleft"
+         left="23"
+         name="move up btn"
+         scale_image="false"
+         tool_tip="Fly up (press E)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
          image_selected="Movement_TurnLeft_On"
          image_pressed_selected="Movement_TurnLeft_On"
          image_unselected="Movement_TurnLeft_Off"
          layout="topleft"
-         left="17"
+         left="15"
          name="turn left btn"
          scale_image="false"
          tool_tip="Turn left (press Left Arrow or A)"
-         top="45"
-         width="25" />
-        <button
-         follows="left|bottom"
-         height="25"
-         image_selected="Movement_TurnRight_On"
-         image_pressed_selected="Movement_TurnRight_On"
-         image_unselected="Movement_TurnRight_Off"
-         layout="topleft"
-         left_pad="34"
-         name="turn right btn"
-         scale_image="false"
-         tool_tip="Turn right (press Right Arrow or D)"
-         top_delta="0"
-         width="25" />
-        <button
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
          follows="left|bottom"
-         height="25"
-         image_selected="Movement_Up_On"
-         image_pressed_selected="Movement_Up_On"
-         image_unselected="Movement_Up_Off"
+         height="24"
+         image_selected="Movement_Left_On"
+         image_pressed_selected="Movement_Left_On"
+         image_unselected="Movement_Left_Off"
          layout="topleft"
-         left="10"
-         name="move up btn"
+         left="18"
+         name="move left btn"
+         quadrant="left"
          scale_image="false"
-         tool_tip="Fly up, press E"
-         top="14"
-         width="25" />
+         tool_tip="Walk left (press Shift + Left Arrow or A)"
+         top_pad="-3"
+         width="24" />
+        <!-- Right column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
          image_selected="Movement_Down_On"
          image_pressed_selected="Movement_Down_On"
          image_unselected="Movement_Down_Off"
          layout="topleft"
-         left_pad="45"
+         right="-21"
          name="move down btn"
          scale_image="false"
-         tool_tip="Fly down, press C"
-         top_delta="0"
-         width="20" />
+         tool_tip="Fly down (press C)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_TurnRight_On"
+         image_pressed_selected="Movement_TurnRight_On"
+         image_unselected="Movement_TurnRight_Off"
+         layout="topleft"
+         right="-13"
+         name="turn right btn"
+         scale_image="false"
+         tool_tip="Turn left (press Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_Right_On"
+         image_pressed_selected="Movement_Right_On"
+         image_unselected="Movement_Right_Off"
+         layout="topleft"
+         name="move right btn"
+         quadrant="right"
+         right="-16"
+         scale_image="false"
+         tool_tip="Walk right (press Shift + Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <!-- Middle column -->
         <joystick_turn
          follows="left|bottom"
          height="25"
@@ -124,7 +196,7 @@
          quadrant="up"
          scale_image="false"
          tool_tip="Walk forward (press up arrow or W)"
-         top_delta="10"
+         top="22"
          width="21" />
         <joystick_turn
          follows="left|bottom"
@@ -138,7 +210,7 @@
          quadrant="down"
          scale_image="false"
          tool_tip="Walk backward (press down arrow or S)"
-         top_delta="30"
+         top_pad="7"
          width="21" />
     </panel>
 <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
@@ -149,7 +221,7 @@
      left="0"
      name="panel_modes"
      top_pad="0"
-     width="115">
+     width="113">
         <button
          follows="left|bottom"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index b48943c699..3effc9de89 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -6,7 +6,7 @@
  name="panel_stand_stop_flying"
  mouse_opaque="false"
  visible="true"
- width="115">
+ width="113">
     <button
      follows="left|bottom"
      height="19"
@@ -16,7 +16,7 @@
      tool_tip="Click here to stand up."
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
     <button
      follows="left|bottom"
      height="19"
@@ -26,5 +26,5 @@
      tool_tip="Stop flying"
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
 </panel>
-- 
cgit v1.2.3