diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-02-12 16:24:24 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-02-12 16:24:24 +0200 |
| commit | 5a5262bbdc72f5040cd681b452417c29c86cfafe (patch) | |
| tree | 11c7e9b0f2866ce7f24e109b6b3e27bd8faff94e /indra/newview/llagent.cpp | |
| parent | 8b609519ea46b785e529c83067ede3656fc10828 (diff) | |
Fixed normal bug EXT - 5248 (Default group icon for IM sessions in multifloater). The problem was in LLAgent::isInGroup() logic. In God Mode it always returned true, even if it was not so. Added ability to ignore God Mode in LLAgent::isInGroup().
--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(); |