diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-12 15:24:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-12 15:24:56 -0400 |
| commit | d17614ca6121dde0ec917664796f263045ad5b6c (patch) | |
| tree | 79535b8ab5cfb38302aaa46dc0531ea5a67da9aa /indra/newview/llagent.cpp | |
| parent | 22e3e8461cf5a36754369c2648b1b4cd252a4d5c (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 092d868bb9..297bd9a05b 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2843,7 +2843,7 @@ BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ignore_god_mode /* FALSE */ // This implementation should mirror LLAgentInfo::hasPowerInGroup BOOL LLAgent::hasPowerInGroup(const LLUUID& group_id, U64 power) const { - if (isGodlike()) + if (isGodlikeWithoutAdminMenuFakery()) return true; // GP_NO_POWERS can also mean no power is enough to grant an ability. |