diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
commit | 1147cb1afbc21e1251614895844e95bca9b6b5bc (patch) | |
tree | da01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/llagentaccess.cpp | |
parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) |
Automated merge from trunk
Diffstat (limited to 'indra/newview/llagentaccess.cpp')
-rw-r--r-- | indra/newview/llagentaccess.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp index eb978eb6c1..915dabb935 100644 --- a/indra/newview/llagentaccess.cpp +++ b/indra/newview/llagentaccess.cpp @@ -69,12 +69,21 @@ bool LLAgentAccess::isGodlike() const #endif } +bool LLAgentAccess::isGodlikeWithoutAdminMenuFakery() const +{ +#ifdef HACKED_GODLIKE_VIEWER + return true; +#else + return mGodLevel > GOD_NOT; +#endif +} + U8 LLAgentAccess::getGodLevel() const { #ifdef HACKED_GODLIKE_VIEWER return GOD_MAINTENANCE; #else - if(mAdminOverride) return GOD_FULL; + if(mAdminOverride) return GOD_FULL; // :( return mGodLevel; #endif } |