diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llagent.h | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 5b6c3c0a1d..ad0606aea2 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -239,6 +239,8 @@ public: BOOL isGodlike() const; U8 getGodLevel() const; + bool isTeen() const; + void setTeen(bool teen); BOOL isGroupTitleHidden() const { return mHideGroupTitle; } BOOL isGroupMember() const { return !mGroupID.isNull(); } // This is only used for building titles! const LLUUID &getGroupID() const { return mGroupID; } @@ -666,8 +668,6 @@ public: F32 mDrawDistance; - // Access or "maturity" level - U8 mAccess; // SIM_ACCESS_MATURE or SIM_ACCESS_PG U64 mGroupPowers; BOOL mHideGroupTitle; char mGroupTitle[DB_GROUP_TITLE_BUF_SIZE]; /*Flawfinder: ignore*/ // honorific, like "Sir" @@ -703,6 +703,8 @@ public: static std::map<LLString, LLString> sTeleportProgressMessages; private: + // Access or "maturity" level + U8 mAccess; // SIM_ACCESS_MATURE or SIM_ACCESS_PG ETeleportState mTeleportState; LLString mTeleportMessage; |