From e3739edeff2e872ecee5f4dc29247f09db1ed87c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 2 Nov 2013 21:57:06 +0100
Subject: BUG-3764: Groups count in groups list does not display if floater is
 resized

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index dc0e4a5947..d2caf63052 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -500,12 +500,13 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
             <text
                 type="string"
                 length="1"
-                follows="all"
+                follows="left|top|right"
                 height="14"
                 layout="topleft"
                 right="-10"
                 top_pad="4"
                 left="3"
+                use_ellipses="true"
                 name="groupcount">
               You belong to [COUNT] groups, and can join [REMAINING] more.
             </text>
-- 
cgit v1.2.3


From 52ec6f9af029797615a80e5a889572c18914d56e Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 26 Nov 2013 15:09:55 -0500
Subject: remove excessively complex fixes for MAINT-2914 and MAINT-3142

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3caf2b3d7e..05013f6b1e 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -66,8 +66,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_position="top"
      top="0"
      halign="center"
-     right="-5"
-     use_highlighting_on_hover="true">
+     right="-5">
 
 <!-- ================================= NEARBY tab =========================== -->
 
-- 
cgit v1.2.3