diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
| commit | a88de5d45fe698bf9193659a677927c96c319ad6 (patch) | |
| tree | 00f2fc46b6f012e2acf7410666902b723938347f /indra/newview/llpanelgroupgeneral.h | |
| parent | 4c20cc3e46d0392c63ecec304858493c8f59059b (diff) | |
| parent | 78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
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; |