diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
| commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
| tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/newview/llfloateravatartextures.cpp | |
| parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/newview/llfloateravatartextures.cpp')
| -rw-r--r-- | indra/newview/llfloateravatartextures.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp index a6613968fb..4e10b4fc2c 100644 --- a/indra/newview/llfloateravatartextures.cpp +++ b/indra/newview/llfloateravatartextures.cpp @@ -27,6 +27,9 @@ #include "llviewerprecompiledheaders.h" #include "llfloateravatartextures.h" +// library headers +#include "llavatarnamecache.h" + #include "llagent.h" #include "llagentwearables.h" #include "lltexturectrl.h" @@ -40,7 +43,6 @@ LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLSD& id) : LLFloater(id), mID(id.asUUID()) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_textures.xml"); } LLFloaterAvatarTextures::~LLFloaterAvatarTextures() @@ -132,10 +134,10 @@ void LLFloaterAvatarTextures::refresh() LLVOAvatar *avatarp = find_avatar(mID); if (avatarp) { - std::string fullname; - if (gCacheName->getFullName(avatarp->getID(), fullname)) + LLAvatarName av_name; + if (LLAvatarNameCache::get(avatarp->getID(), &av_name)) { - setTitle(mTitle + ": " + fullname); + setTitle(mTitle + ": " + av_name.getCompleteName()); } for (U32 i=0; i < TEX_NUM_INDICES; i++) { |