diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-28 20:05:26 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-28 20:05:26 +0200 |
| commit | 8019eba6af62c81f7ed29105d4d345e78b3f8432 (patch) | |
| tree | 5f519c33a63cc1d6c6284565ab0a193b674e2e57 /indra/newview | |
| parent | 9be01d0a16f8367fc0b7165e8164f758b76994ee (diff) | |
| parent | 515c06727ce2f6ebb670f8a470bfc4b319a57224 (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelpeople.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_people.xml | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 6b86459d8f..e28f37ccb0 100755 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -587,7 +587,12 @@ BOOL LLPanelPeople::postBuild() getChild<LLFilterEditor>("groups_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2)); getChild<LLFilterEditor>("recent_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2)); getChild<LLFilterEditor>("fbc_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2)); - getChild<LLTextBox>("groupcount")->setURLClickedCallback(boost::bind(&LLPanelPeople::onGroupLimitInfo, this)); + + if(gMaxAgentGroups <= BASE_MAX_AGENT_GROUPS) + { + getChild<LLTextBox>("groupcount")->setText(getString("GroupCountWithInfo")); + getChild<LLTextBox>("groupcount")->setURLClickedCallback(boost::bind(&LLPanelPeople::onGroupLimitInfo, this)); + } mTabContainer = getChild<LLTabContainer>("tabs"); mTabContainer->setCommitCallback(boost::bind(&LLPanelPeople::onTabSelected, this, _2)); diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 4fb8b9a67f..2cb06d6877 100755 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -53,6 +53,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M <string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/> + <string + name="GroupCountWithInfo" + value="You belong to [COUNT] groups, and can join [REMAINING] more. [secondlife:/// Want more?]"/> <tab_container bottom="-10" follows="all" @@ -506,7 +509,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="3" use_ellipses="true" name="groupcount"> - You belong to [COUNT] groups, and can join [REMAINING] more. [secondlife:/// Want more?] + You belong to [COUNT] groups, and can join [REMAINING] more. </text> <group_list allow_select="true" |