diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
| commit | 3d137bae5c5435dde305323179d8d3d6c9720bad (patch) | |
| tree | 959fe5ab17e21ab6d4455da7f7173270f8d01732 /indra/newview/llpanelgroupgeneral.h | |
| parent | 6fe7144104cd8b5bd9c7d215f76afdeafe13b7ee (diff) | |
| parent | f8b51f40289255ce38f65830f5bb0f29def3b757 (diff) | |
Merge with viewer-chui
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 cecf613a7e..b7f4a01139 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; |