summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterproperties.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2017-02-15 20:40:03 +0200
committerandreykproductengine <akleshchev@productengine.com>2017-02-15 20:40:03 +0200
commit605160d501158362ced3e62425bdcd8d28895fd5 (patch)
tree0bd0338860645e47902b9f761d6309bc46688116 /indra/newview/llfloaterproperties.cpp
parent9c015df3fab0b5cc229ad1a0393e5da50ee29883 (diff)
MAINT-7118 Swapping legacy people API with new cache
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
-rw-r--r--indra/newview/llfloaterproperties.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 6bfc780722..1310a60638 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -30,6 +30,7 @@
#include <algorithm>
#include <functional>
#include "llcachename.h"
+#include "llavatarnamecache.h"
#include "lldbstrings.h"
#include "llfloaterreg.h"
@@ -274,12 +275,12 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
if (item->getCreatorUUID().notNull())
{
- std::string name;
- gCacheName->getFullName(item->getCreatorUUID(), name);
+ LLAvatarName av_name;
+ LLAvatarNameCache::get(item->getCreatorUUID(), &av_name);
getChildView("BtnCreator")->setEnabled(TRUE);
getChildView("LabelCreatorTitle")->setEnabled(TRUE);
getChildView("LabelCreatorName")->setEnabled(TRUE);
- getChild<LLUICtrl>("LabelCreatorName")->setValue(name);
+ getChild<LLUICtrl>("LabelCreatorName")->setValue(av_name.getUserName());
}
else
{
@@ -301,7 +302,9 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
}
else
{
- gCacheName->getFullName(perm.getOwner(), name);
+ LLAvatarName av_name;
+ LLAvatarNameCache::get(perm.getOwner(), &av_name);
+ name = av_name.getUserName();
}
getChildView("BtnOwner")->setEnabled(TRUE);
getChildView("LabelOwnerTitle")->setEnabled(TRUE);