summaryrefslogtreecommitdiff
path: root/indra/newview/llagentaccess.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
committerDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
commit99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch)
tree8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llagentaccess.cpp
parent746037362ed07af0c799caf22cf9e425744359a0 (diff)
parent7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff)
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llagentaccess.cpp')
-rw-r--r--indra/newview/llagentaccess.cpp11
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
}