diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
| commit | 068e3cc469793c75b0d54ef0864388582bb3b63c (patch) | |
| tree | dbab152cf43bc84f23b2f63f9e8f8d83117e28af /indra/newview/llfloateravatartextures.cpp | |
| parent | e748167abfabbc541c3ceb9e2d5a46fa3564f15a (diff) | |
| parent | 8158c5637a9ad83a7b36b104116c37390b57c7ab (diff) | |
pull fix for STORM-304 / STORM-386
Diffstat (limited to 'indra/newview/llfloateravatartextures.cpp')
| -rw-r--r-- | indra/newview/llfloateravatartextures.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp index 10cf26521f..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" @@ -131,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++) { |