summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-13 12:09:04 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-13 12:09:04 -0400
commitf5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch)
treede1746f9e607d05b535523a3179ece971edd61ba /indra/newview/llgroupmgr.h
parent0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff)
parent337976096530729a7d671df68907cd59a7986972 (diff)
Merge from viewer-development.
Diffstat (limited to 'indra/newview/llgroupmgr.h')
-rw-r--r--indra/newview/llgroupmgr.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index faf0531c10..df3cd17e03 100644
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -86,7 +86,7 @@ public:
BOOL isInRole(const LLUUID& role_id) { return (mRolesList.find(role_id) != mRolesList.end()); }
-protected:
+private:
LLUUID mID;
S32 mContribution;
U64 mAgentPowers;
@@ -233,6 +233,9 @@ public:
BOOL isRoleMemberDataComplete() { return mRoleMemberDataComplete; }
BOOL isGroupPropertiesDataComplete() { return mGroupPropertiesDataComplete; }
+ F32 getAccessTime() const { return mAccessTime; }
+ void setAccessed();
+
public:
typedef std::map<LLUUID,LLGroupMemberData*> member_list_t;
typedef std::map<LLUUID,LLGroupRoleData*> role_list_t;
@@ -280,6 +283,7 @@ private:
BOOL mGroupPropertiesDataComplete;
BOOL mPendingRoleMemberRequest;
+ F32 mAccessTime;
};
struct LLRoleAction