diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
commit | 525de5554022b946641db446a5b5153f9e670e10 (patch) | |
tree | d7d679724515f6eb839f87161510ba0a0d06c89b /indra/newview/llpanelimcontrolpanel.h | |
parent | 219cd6ecda60e1c48852f582f0994573fd0e10ae (diff) | |
parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 45ada3ae1d..3bbe24ecb9 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -83,6 +83,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(); |