diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2010-02-12 16:29:00 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2010-02-12 16:29:00 +0200 |
| commit | b1a5d52f75ea00d4936ed791aa9e8f07e10e64ce (patch) | |
| tree | 7cd813ee601e94a4936cbcd329855b5518f69431 /indra/newview/llagent.cpp | |
| parent | c06742b231b9e7b108f5e3dce6b72d9b9a639537 (diff) | |
| parent | 951fd66000a22d65c76d44f5de5e38a76513b528 (diff) | |
merge
--HG--
branch : product-engine
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 59f61dfdfb..7929946620 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) const +BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ingnore_God_mod /* FALSE */) const { - if (isGodlike()) + if (!ingnore_God_mod && isGodlike()) return true; S32 count = mGroups.count(); |