diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
| commit | ae39812d704a2b92faf213f1626dbe19a34eceb4 (patch) | |
| tree | c26efa4fb4a033db1d5c65d84fbaade14ec1d756 /indra/newview/llagent.cpp | |
| parent | c0f2f151b226417152adecb507e6b1b7f2a1f8ce (diff) | |
| parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7929946620..3675be16e9 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5027,9 +5027,9 @@ void LLAgent::buildFullnameAndTitle(std::string& name) const } } -BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ingnore_God_mod /* FALSE */) const +BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ignore_god_mode /* FALSE */) const { - if (!ingnore_God_mod && isGodlike()) + if (!ignore_god_mode && isGodlike()) return true; S32 count = mGroups.count(); |