Integrate group limit with Hippo Grid Manager

This commit is contained in:
Siana Gearz
2011-01-31 21:04:06 +01:00
parent 2550e2b6f2
commit 86acf69bab
4 changed files with 12 additions and 8 deletions

View File

@@ -153,6 +153,9 @@
# include "shcommandhandler.h"
#endif //shy_mod
#include "hippogridmanager.h"
#include "hippolimits.h"
#include <boost/tokenizer.hpp>
#if LL_WINDOWS // For Windows specific error handler
@@ -666,7 +669,7 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
if(option == 0 && !group_id.isNull())
{
// check for promotion or demotion.
S32 max_groups = gMaxAgentGroups;
S32 max_groups = gHippoLimits->getMaxAgentGroups();
if(gAgent.isInGroup(group_id)) ++max_groups;
if(gAgent.mGroups.count() < max_groups)