summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelimcontrolpanel.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-09-03 15:30:16 +0100
committerAimee Linden <aimee@lindenlab.com>2010-09-03 15:30:16 +0100
commit0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch)
tree1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/newview/llpanelimcontrolpanel.h
parentce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff)
parent54b9992eaefe2b68d16a6264c1901f12612e99dc (diff)
Merge between james/viewer-identity-evolution and dessie/viewer-public
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
-rw-r--r--indra/newview/llpanelimcontrolpanel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index 0a1fd70c08..4594a0d021 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -89,6 +89,9 @@ public:
// LLFriendObserver trigger
virtual void changed(U32 mask);
+protected:
+ void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
+
private:
void onViewProfileButtonClicked();
void onAddFriendButtonClicked();