summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.h
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:53:24 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:53:24 -0800
commit0a16fc53cfa62447e37505214391af5f4d04bb7f (patch)
tree655c5dbd1849cd774a11b5a4a572e2c3b00a1f52 /indra/newview/llgroupmgr.h
parent3636b10d479043c6e7386bc60af3228bd856f737 (diff)
parent78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (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.h5
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