diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 15:58:35 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 15:58:35 -0800 |
| commit | d92608f1dc0a4319f5452ef7ac3121f2ef87289f (patch) | |
| tree | 25d3e52103132dd33deaa9fc39ca9d084abba002 /indra/newview/llagent.cpp | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (diff) | |
| parent | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
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() |