diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 16:01:37 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 16:01:37 -0500 |
| commit | 0354b47a8fbd724b0662b0ef06331876a1c5828a (patch) | |
| tree | 68991b522553bfd9ac3336320a17bc207ac73556 /indra/newview/llpanelgroupgeneral.h | |
| parent | 377544c8b40f2d35ba7b29252ed471d19bb983e5 (diff) | |
| parent | d9bcaf1821c22da6cde413b9bb98b82843375223 (diff) | |
merge changes for MAINT-1979
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; |