diff options
| author | James Cook <james@lindenlab.com> | 2010-05-25 15:45:45 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-25 15:45:45 -0700 |
| commit | d8f2e1d820e717f267375773407110bec1e9dae2 (patch) | |
| tree | 8d8acf246549b22c06d9e6fdd7306fa1c4b18591 /indra/newview/llfloatergodtools.cpp | |
| parent | 659163c15cb0bb52ca960ddf417b9c6b874c357a (diff) | |
| parent | a70d9363dadd23f5304013f87d47e5251d62c575 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
| -rw-r--r-- | indra/newview/llfloatergodtools.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index bd07cfdfbf..44f104d687 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -34,6 +34,7 @@ #include "llfloatergodtools.h" +#include "llavatarnamecache.h" #include "llcoord.h" #include "llfontgl.h" #include "llframetimer.h" @@ -1151,11 +1152,11 @@ void LLPanelObjectTools::onClickSetBySelection(void* data) panelp->childSetValue("target_avatar_name", name); } -void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids) +void LLPanelObjectTools::callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names) { if (ids.empty() || names.empty()) return; mTargetAvatar = ids[0]; - childSetValue("target_avatar_name", names[0]); + childSetValue("target_avatar_name", names[0].getCompleteName()); refresh(); } |