diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:14:15 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:14:15 -0800 |
| commit | 7e8929ad535f4be4340ff66978b09ca32b64f4fd (patch) | |
| tree | 2a1e62f5e3305fe79c52f18de3ba436eca1d0381 /indra/newview/llviewermessage.cpp | |
| parent | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (diff) | |
| parent | d92608f1dc0a4319f5452ef7ac3121f2ef87289f (diff) | |
Merge
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) |