diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
commit | a88de5d45fe698bf9193659a677927c96c319ad6 (patch) | |
tree | 00f2fc46b6f012e2acf7410666902b723938347f /indra/newview/llgroupmgr.h | |
parent | 4c20cc3e46d0392c63ecec304858493c8f59059b (diff) | |
parent | 78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (diff) |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
Diffstat (limited to 'indra/newview/llgroupmgr.h')
-rw-r--r-- | indra/newview/llgroupmgr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h index 62b2978f21..d8c1ab7ef5 100644 --- a/indra/newview/llgroupmgr.h +++ b/indra/newview/llgroupmgr.h @@ -236,6 +236,8 @@ public: F32 getAccessTime() const { return mAccessTime; } void setAccessed(); + const LLUUID& getMemberVersion() const { return mMemberVersion; } + public: typedef std::map<LLUUID,LLGroupMemberData*> member_list_t; typedef std::map<LLUUID,LLGroupRoleData*> role_list_t; @@ -284,6 +286,9 @@ private: BOOL mPendingRoleMemberRequest; F32 mAccessTime; + + // Generate a new ID every time mMembers + LLUUID mMemberVersion; }; struct LLRoleAction |