aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroups.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-29 15:50:33 +0200
committerArmin Weatherwax2010-04-12 17:11:05 +0200
commit3fbbd9e0b7516d1c170267acc26a767af1fa4b1d (patch)
treeed49e0dcd64f1244fbbfea6bc844ab2788eaaa50 /linden/indra/newview/llfloatergroups.cpp
parentUse Hippogridmanager for OpenSim detection. (diff)
downloadmeta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.zip
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.gz
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.bz2
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.xz
support more OpenSim limits (number of groups, hollow size)
Diffstat (limited to 'linden/indra/newview/llfloatergroups.cpp')
-rw-r--r--linden/indra/newview/llfloatergroups.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 874249b..e94734d 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -58,6 +58,8 @@
58#include "llviewerwindow.h" 58#include "llviewerwindow.h"
59#include "llimview.h" 59#include "llimview.h"
60 60
61#include "hippoLimits.h"
62
61// static 63// static
62std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances; 64std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
63 65
@@ -200,7 +202,7 @@ void LLPanelGroups::reset()
200 group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); 202 group_list->operateOnAll(LLCtrlListInterface::OP_DELETE);
201 } 203 }
202 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count())); 204 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
203 childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS)); 205 childSetTextArg("groupcount", "[MAX]", llformat("%d", gHippoLimits->getMaxAgentGroups()));
204 206
205 const std::string none_text = getString("none"); 207 const std::string none_text = getString("none");
206 init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text); 208 init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
@@ -212,7 +214,7 @@ BOOL LLPanelGroups::postBuild()
212 childSetCommitCallback("group list", onGroupList, this); 214 childSetCommitCallback("group list", onGroupList, this);
213 215
214 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count())); 216 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
215 childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS)); 217 childSetTextArg("groupcount", "[MAX]", llformat("%d", gHippoLimits->getMaxAgentGroups()));
216 218
217 const std::string none_text = getString("none"); 219 const std::string none_text = getString("none");
218 init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text); 220 init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
@@ -270,7 +272,7 @@ void LLPanelGroups::enableButtons()
270 childDisable("IM"); 272 childDisable("IM");
271 childDisable("Leave"); 273 childDisable("Leave");
272 } 274 }
273 if(gAgent.mGroups.count() < MAX_AGENT_GROUPS) 275 if(gAgent.mGroups.count() < gHippoLimits->getMaxAgentGroups())
274 { 276 {
275 childEnable("Create"); 277 childEnable("Create");
276 } 278 }