diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-14 11:21:37 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-14 11:21:37 +0200 |
| commit | 70ea607842c239cd87b229b416e13485da974658 (patch) | |
| tree | 176920ebf0ab65526b9839f5b57bb7bd0f856e4e /indra/newview/llpanelgroupgeneral.h | |
| parent | e90bd165c8f41ac4a670d6c52a7ee2d7b3728991 (diff) | |
| parent | 08cc82ec483fab8299d52ba979f04df95e525acb (diff) | |
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; |