diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
| commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
| tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/newview/llagent.cpp | |
| parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
| parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) | |
merge
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 c9bd7851ed..3a45c79ec3 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -59,6 +59,7 @@ #include "llsidetray.h" #include "llsky.h" #include "llsmoothstep.h" +#include "llstartup.h" #include "llstatusbar.h" #include "llteleportflags.h" #include "lltool.h" @@ -2452,7 +2453,7 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO BOOL LLAgent::canJoinGroups() const { - return mGroups.count() < MAX_AGENT_GROUPS; + return mGroups.count() < gMaxAgentGroups; } LLQuaternion LLAgent::getHeadRotation() |