diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 20:52:51 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 20:52:51 +0200 |
| commit | 6662f7348bfd453745aeba09f2ae2bcdfa0057e9 (patch) | |
| tree | ec6e84899b854dd10bb80197b032b73377d7a1fa /indra/newview/llagent.cpp | |
| parent | 24c38d822acfe37f177900014258c89cc1c237f0 (diff) | |
| parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) | |
Merge branch 'master' into DRTVWR-500
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index be90e623ad..9964a43343 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -32,6 +32,7 @@ #include "pipeline.h" #include "llagentaccess.h" +#include "llagentbenefits.h" #include "llagentcamera.h" #include "llagentlistener.h" #include "llagentwearables.h" @@ -2992,7 +2993,7 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO BOOL LLAgent::canJoinGroups() const { - return (S32)mGroups.size() < gMaxAgentGroups; + return (S32)mGroups.size() < LLAgentBenefitsMgr::current().getGroupMembershipLimit(); } LLQuaternion LLAgent::getHeadRotation() |