diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-12-03 16:37:05 -0800 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-12-03 16:37:05 -0800 |
| commit | 5c22524f29e4ab1f287f0e443bbdbea2f516c0d2 (patch) | |
| tree | f876f68a56e93cca1e349a29f9671dc88c06be55 /indra/newview/llpanelgroupgeneral.h | |
| parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) | |
MAINT-1979 Viewer crashes while attempting to join group in the moment of loading group members
* Fix one race condition that could dereference a dangling pointer.
reviewed with Simon and Baker.
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.h')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h index b179f78c56..1b4e8e2645 100644 --- a/indra/newview/llpanelgroupgeneral.h +++ b/indra/newview/llpanelgroupgeneral.h @@ -63,7 +63,7 @@ public: virtual void setupCtrls (LLPanel* parent); - void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLUUID& id, const LLAvatarName& av_name); + void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLAvatarName& av_name); private: void reset(); @@ -90,7 +90,6 @@ private: BOOL mChanged; BOOL mFirstUse; std::string mIncompleteMemberDataStr; - LLUUID mUdpateSessionID; // Group information (include any updates in updateChanged) LLLineEditor *mGroupNameEditor; |