From 7629a39a6df70b2a04cd1e4f259b32a863c355f6 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 10 Jun 2010 14:30:07 +0300
Subject: EXT-7644 FIXED Avoided duplication of 'Save as' dialogs. reviewed by
 Vadim Savchuk at https://codereview.productengine.com/secondlife/r/554/

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 76a41a3b13..aca3b750c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2066,6 +2066,7 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
+    <unique/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 9ed013048be5a17ea91200e7d9b3db32d7c61da2 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 10 Jun 2010 20:45:53 +0300
Subject: EXT-7768 FIXED Default accordion widget's message was removed (set to
 empty). reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/561/

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index b817ba56ca..05d7447a6f 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -8,7 +8,6 @@
      height="100"
      h_pad="10"
      name="no_visible_items_msg"
-     value="There are no visible content here."
      v_pad="15"
      width="200"
      wrap="true "/>
-- 
cgit v1.2.3


From 968c7cf90685acbe8554a1843d5bb0c9fd9658e7 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 10 Jun 2010 21:33:07 +0300
Subject: EXT-7511 FIXED Resolved newly reported problems in appearance UI

- Selection top cropping problem reproduces only for some systems and is caused by deeper problems in flatlist, so in this case it was fixed via workaround (increasing of item pad in flatlists) and the cause of it is in new ticket- EXT-7752 (Flatlist selection is a bit different on different systems).

- '+' button now has a 3 px pad from right for consistensy with "wrench" from other items.

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_cof_wearables.xml     |  6 +++---
 .../xui/en/panel_dummy_clothing_list_item.xml        | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

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 d36c2a4e6f..f016c27b0a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -28,7 +28,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -44,7 +44,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -60,7 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
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 20652df918..b1f4cbb079 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
@@ -49,16 +49,26 @@
      top="4"
      value="..."
      width="359" />
-    <button 
-     name="btn_add"
+    <panel
+     name="btn_add_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="AddItem_Off"
      top="0"
      left="0"
      height="23"
-     width="23"
-     tab_stop="false" />
+     width="26"
+     tab_stop="false">
+      <button 
+       name="btn_add"
+       layout="topleft"
+       follows="top|right"
+       image_overlay="AddItem_Off"
+       top="0"
+       left="0"
+       height="23"
+       width="23"
+       tab_stop="false" />
+    </panel>
     <icon
      follows="left|right|top"
      height="3"
-- 
cgit v1.2.3


From 99bf3245bd89afebcf1d00bf45d5367c1a83bee1 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 10 Jun 2010 21:54:23 +0300
Subject: EXT-7622 FIXED Menu items order was updated - according to Design
 Spec. reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/563/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_wearable_list_item.xml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index fa5ca60a19..430a7b6444 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -37,13 +37,6 @@
      label="Attach to HUD  ▶"
      layout="topleft"
      name="wearable_attach_to_hud" />
-    <menu_item_call
-     label="Object Profile"
-     layout="topleft"
-     name="object_profile">
-        <on_click
-         function="Attachment.Profile" />
-    </menu_item_call>
     <menu_item_call
      label="Take Off"
      layout="topleft"
@@ -58,6 +51,13 @@
         <on_click
          function="Wearable.Edit" />
     </menu_item_call>
+    <menu_item_call
+     label="Object Profile"
+     layout="topleft"
+     name="object_profile">
+        <on_click
+         function="Attachment.Profile" />
+    </menu_item_call>
     <menu_item_call
      label="Show Original"
      layout="topleft"
-- 
cgit v1.2.3


From d8adbf8438765dc994aeb2208c45e71184fc0347 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 10 Jun 2010 15:37:07 -0700
Subject: Fix EXT-7167: updated status url to status.secondlifegrid.net.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d14a6b3c8..1f4e40a43d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3186,7 +3186,7 @@ Abuse Report</string>
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
 
-	Please check secondlife.com/status to see if there is a known problem with the service.  
+	Please check status.secondlifegrid.net to see if there is a known problem with the service.  
         If you continue to experience problems, please check your network and firewall setup.
   </string>
 
-- 
cgit v1.2.3


From 1ae5d134293ee119a4430e27ebe0d83ae041cad0 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 10 Jun 2010 16:43:26 -0700
Subject: Tidy up XUI and make correct Buy Currency HTML floater correct size.
 http://lltrial.onjira.com/browse/VI-155

---
 .../default/xui/en/floater_buy_currency_html.xml   | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 4643f66bd8..23d510f0cf 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  can_resize="false"
- height="280"
+ can_close="true"
+ width="422"
+ height="202"
  layout="topleft"
- min_height="280"
- min_width="450"
  name="floater_buy_currency_html"
  help_topic="floater_buy_currency_html"
  save_rect="true"
  single_instance="true"
  title="BUY CURRENCY"
- width="452">
- <floater.string
-      name="buy_currency_url" translate="false">
-        https://quick-buy-www.jeff.ooze.lindenlab.com/en/display
- </floater.string>
-    <web_browser
-     bottom="278"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="2"
-     name="browser"
-     top="18"
-     width="450" />
+>
+  <floater.string
+    name="buy_currency_url" translate="false">
+    https://quick-buy-www.quick-b.ooze.lindenlab.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+  </floater.string>
+  <web_browser
+    follows="all"
+    layout="topleft"
+    left="1"
+    right="-1" 
+    top="1"
+    bottom="-1" 
+    ignore_ui_scale="false"
+    name="browser"/>
 </floater>
-- 
cgit v1.2.3


From 63577b8fe3f2b46da70e373364028ae45faf4e06 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 10 Jun 2010 16:53:40 -0700
Subject: Update QuickBuy URL in viewer with 'correct' one.
 http://lltrial.onjira.com/browse/VI-147

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 23d510f0cf..4b990fa566 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -13,7 +13,7 @@
 >
   <floater.string
     name="buy_currency_url" translate="false">
-    https://quick-buy-www.quick-b.ooze.lindenlab.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+    https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
   </floater.string>
   <web_browser
     follows="all"
-- 
cgit v1.2.3