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.h | |
parent | c06742b231b9e7b108f5e3dce6b72d9b9a639537 (diff) | |
parent | 951fd66000a22d65c76d44f5de5e38a76513b528 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r-- | indra/newview/llagent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index beede7fbe3..1573fd7131 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -982,7 +982,7 @@ private: //-------------------------------------------------------------------- public: // Checks against all groups in the entire agent group list. - BOOL isInGroup(const LLUUID& group_id) const; + BOOL isInGroup(const LLUUID& group_id, BOOL ingnore_God_mod = FALSE) const; protected: // Only used for building titles. BOOL isGroupMember() const { return !mGroupID.isNull(); } |