diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/newview/llpanelplaceinfo.h | |
parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) |
Merge from http://hg.secondlife.com/viewer-identity (display names)
Diffstat (limited to 'indra/newview/llpanelplaceinfo.h')
-rw-r--r-- | indra/newview/llpanelplaceinfo.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index 1e0975a898..64f0b6b550 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -34,6 +34,7 @@ #include "llremoteparcelrequest.h" +class LLAvatarName; class LLExpandableTextBox; class LLIconCtrl; class LLInventoryItem; @@ -96,9 +97,10 @@ public: void createPick(const LLVector3d& pos_global, LLPanelPickEdit* pick_panel); protected: - static void nameUpdatedCallback(LLTextBox* text, - const std::string& first, - const std::string& last); + static void onNameCache(LLTextBox* text, const std::string& full_name); + static void onAvatarNameCache(const LLUUID& agent_id, + const LLAvatarName& av_name, + LLTextBox* text); /** * mParcelID is valid only for remote places, in other cases it's null. See resetLocation() |