summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelimcontrolpanel.h
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-11 10:38:34 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-11 10:38:34 +0200
commitde7ca5abb26930025b16c7f50aa7469c3b33c09e (patch)
tree40474e1e2ee190cae30603ce960e58238929c445 /indra/newview/llpanelimcontrolpanel.h
parentb0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (diff)
parent0e035fd9b8090c59cc7388809ebe0bf25b54cd9d (diff)
Merge. Note: changeset b048156543b6 (Fixed normal bug EXT - 5104) was initially commited into default branch by mistake
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
-rw-r--r--indra/newview/llpanelimcontrolpanel.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index 3ab505a084..ce8fc58e56 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -89,9 +89,6 @@ public:
// LLFriendObserver trigger
virtual void changed(U32 mask);
-protected:
- void nameUpdatedCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
-
private:
void onViewProfileButtonClicked();
void onAddFriendButtonClicked();