From 0aa2bc4831674e61edf680887eba9acec9f997ed Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 28 Aug 2009 22:58:17 +0000
Subject: svn merge -r 1490-1500
 https://svn.aws.productengine.com/secondlife/pe/stable-2 Bug Fixes: * EXT-637
 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales
 Known issues: * If old Calling Card of person who presents in the friend list
 is removed - "Do you want to remove ..." dialog is shown, if old Calling Card
 of non-friend is removed it is removed in the old way without any alerts. *
 It is possible to create 2 deep level subfolders under the Calling
 Cards/Friends/ subfolders. This should be disabled due to Accordion does not
 support tree hierarchy. * If friendship is removed when agent is offline,
 Friend Card is not removed from Inventory.

---
 indra/newview/skins/default/xui/en/panel_people.xml | 12 ++++++------
 indra/newview/skins/default/xui/en/strings.xml      |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index fce31a2c68..22823ea98b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -19,8 +19,8 @@
      name="no_friends_online"
      value="No friends online" />
     <string
-     name="no_friends_offline"
-     value="No friends offline" />
+     name="no_friends"
+     value="No friends" />
     <string
      name="no_groups"
      value="No groups" />
@@ -153,14 +153,14 @@
                  can_resize="false"
                  layout="topleft"
                  min_height="100"
-                 name="tab_offline"
-                 title="Offline">
+                 name="tab_all"
+                 title="All">
                     <panel
                      follows="all"
                      height="260"
                      layout="topleft"
                      left="0"
-                     name="tab_offline_panel"
+                     name="tab_all_panel"
                      top="100"
                      width="285">
                         <avatar_list
@@ -169,7 +169,7 @@
                          height="255"
                          layout="topleft"
                          left="0"
-                         name="avatars_offline"
+                         name="avatars_all"
                          top="0"
                          width="285" />
                     </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4560a7138c..27b34d16a8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -413,6 +413,10 @@ this texture in your inventory
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 
+  <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
+	<string name="InvFolder Friends">Friends</string>
+	<string name="InvFolder All">All</string>
+
 	<!-- inventory FVBridge -->
 	<string name="Buy">Buy</string>
 	<string name="BuyforL$">Buy for L$</string>
-- 
cgit v1.2.3