diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
| commit | b75fc0af897124a05ab3842bdfc60f428d22e051 (patch) | |
| tree | 3cce57b84110720ea15f370b496d1bc6340a154f /indra/newview/llgroupmgr.h | |
| parent | 584b615c3444fdeaa0d41f1d9e839edf1518a310 (diff) | |
| parent | def472b45cb17dd125f802dc3be85450135537a8 (diff) | |
merge up to 3.4.4 beta
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 |