summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-12-05 13:58:31 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-12-05 13:58:31 -0500
commitd9bcaf1821c22da6cde413b9bb98b82843375223 (patch)
treef883e500fde87973b43a183f8e8eb00b678492f2 /indra/newview/llgroupmgr.h
parent5a938e3a1c8582d6bfe6df2aa195afcdcafb355a (diff)
parent907abfefc6a827e13edcb33aef2ba7f1c77a7eb5 (diff)
merge changes for DRTVWR-256
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