diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
| commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
| tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/llagentaccess.cpp | |
| parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
| parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) | |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/llagentaccess.cpp')
| -rw-r--r-- | indra/newview/llagentaccess.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp index 08a33ab04a..c4ee321e04 100644 --- a/indra/newview/llagentaccess.cpp +++ b/indra/newview/llagentaccess.cpp @@ -33,8 +33,7 @@ LLAgentAccess::LLAgentAccess(LLControlGroup& savedSettings) : mSavedSettings(savedSettings), mAccess(SIM_ACCESS_PG), mAdminOverride(false), - mGodLevel(GOD_NOT), - mAOTransition(false) + mGodLevel(GOD_NOT) { } @@ -133,18 +132,6 @@ bool LLAgentAccess::isAdult() const return mAccess >= SIM_ACCESS_ADULT; } -void LLAgentAccess::setTeen(bool teen) -{ - if (teen) - { - mAccess = SIM_ACCESS_PG; - } - else - { - mAccess = SIM_ACCESS_MATURE; - } -} - //static int LLAgentAccess::convertTextToMaturity(char text) { @@ -182,16 +169,6 @@ void LLAgentAccess::setMaturity(char text) mSavedSettings.setU32("PreferredMaturity", preferred_access); } -void LLAgentAccess::setTransition() -{ - mAOTransition = true; -} - -bool LLAgentAccess::isInTransition() const -{ - return mAOTransition; -} - bool LLAgentAccess::canSetMaturity(S32 maturity) { if (isGodlike()) // Gods can always set their Maturity level |