summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceinfo.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-05-28 13:30:55 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-05-28 13:30:55 -0700
commit66fe983cb22a7916d46e2df087ce3aade345cdc8 (patch)
treef8e121709c3e243b0b749b7a24baa540f1ec1798 /indra/newview/llpanelplaceinfo.cpp
parent5be933062b0e8dfe6955480b333450a32a444a33 (diff)
parentb944a4792762bf61b7837a29c8580c9823c9670b (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
-rw-r--r--indra/newview/llpanelplaceinfo.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 4c3d6e2758..3b0dcad679 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -34,6 +34,7 @@
#include "llpanelplaceinfo.h"
+#include "llavatarname.h"
#include "llsdutil.h"
#include "llsdutil_math.h"
@@ -285,3 +286,11 @@ void LLPanelPlaceInfo::onNameCache(LLTextBox* text, const std::string& full_name
{
text->setText(full_name);
}
+
+// static
+void LLPanelPlaceInfo::onAvatarNameCache(const LLUUID& agent_id,
+ const LLAvatarName& av_name,
+ LLTextBox* text)
+{
+ text->setText( av_name.getCompleteName() );
+}