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/llviewermessage.cpp | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (diff) | |
| parent | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 0fb64f29ff..5cbd5ffa0b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -639,7 +639,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 = MAX_AGENT_GROUPS; + S32 max_groups = gMaxAgentGroups; if(gAgent.isInGroup(group_id)) ++max_groups; if(gAgent.mGroups.count() < max_groups) |