livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1910

meow-7.2.2
Oz Linden 2013-03-19 15:21:16 -04:00
parent e87000ba07 80ae45238b
commit ca17a74f18
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -692,6 +692,7 @@ Kunnis Basiat
VWR-82
VWR-102
Lance Corrimal
STORM-1910
VWR-25269
Latif Khalifa
VWR-5370
@ -745,6 +746,7 @@ Marc2 Sands
Marianne McCann
Marine Kelley
STORM-281
STORM-1910
MartinRJ Fayray
STORM-1844
STORM-1845

4
indra/newview/llpanelpeople.cpp
View File

@ -75,6 +75,8 @@ static const std::string RECENT_TAB_NAME = "recent_panel";
static const std::string COLLAPSED_BY_USER = "collapsed_by_user";
extern S32 gMaxAgentGroups;
/** Comparator for comparing avatar items by last interaction date */
class LLAvatarItemRecentComparator : public LLAvatarItemComparator
{
@ -878,6 +880,8 @@ void LLPanelPeople::updateButtons()
LLPanel* groups_panel = mTabContainer->getCurrentPanel();
groups_panel->getChildView("activate_btn")->setEnabled(item_selected && !cur_group_active); // "none" or a non-active group selected
groups_panel->getChildView("minus_btn")->setEnabled(item_selected && selected_id.notNull());
groups_panel->getChild<LLUICtrl>("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.count()));
groups_panel->getChild<LLUICtrl>("groupcount")->setTextArg("[REMAINING]", llformat("%d",(gMaxAgentGroups-gAgent.mGroups.count())));
}
else
{

12
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -434,12 +434,22 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<group_list
allow_select="true"
follows="all"
height="356"
height="340"
layout="topleft"
left="3"
name="group_list"
top="0"
width="307" />
<text
type="string"
length="1"
follows="left|bottom"
height="14"
layout="topleft"
right="-10"
name="groupcount">
You belong to [COUNT] groups, and can join [REMAINING] more.
</text>
<panel
background_visible="true"
follows="left|right|bottom"