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/llagent.cpp | |
| parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
| parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) | |
Automated merge from trunk
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 9326566b15..9abac1ef0b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4839,11 +4839,16 @@ void LLAgent::onAnimStop(const LLUUID& id) } } -BOOL LLAgent::isGodlike() const +bool LLAgent::isGodlike() const { return mAgentAccess.isGodlike(); } +bool LLAgent::isGodlikeWithoutAdminMenuFakery() const +{ + return mAgentAccess.isGodlikeWithoutAdminMenuFakery(); +} + U8 LLAgent::getGodLevel() const { return mAgentAccess.getGodLevel(); |