diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-13 10:50:25 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-13 10:50:25 +0200 |
| commit | f83ada32f728740254668792f9d77b5745d80d2e (patch) | |
| tree | 593a31ab109e1e8b088d0c2a5536e73cb6b9a050 /indra/newview/llviewerdisplayname.cpp | |
| parent | b1ac8092eecf5fc9dc4b4867370a51e5dfba4331 (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerdisplayname.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplayname.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp index 24291de6df..d444d47624 100644 --- a/indra/newview/llviewerdisplayname.cpp +++ b/indra/newview/llviewerdisplayname.cpp @@ -148,10 +148,10 @@ public: { LLUUID agent_id = gAgent.getID(); // Flush stale data - LLAvatarNameCache::erase( agent_id ); + LLAvatarNameCache::getInstance()->erase( agent_id ); // Queue request for new data: nothing to do on callback though... // Note: no need to disconnect the callback as it never gets out of scope - LLAvatarNameCache::get(agent_id, boost::bind(&LLViewerDisplayName::doNothing)); + LLAvatarNameCache::getInstance()->get(agent_id, boost::bind(&LLViewerDisplayName::doNothing)); // Kill name tag, as it is wrong LLVOAvatar::invalidateNameTag( agent_id ); } @@ -190,9 +190,9 @@ class LLDisplayNameUpdate : public LLHTTPNode //LLSD headers = response->mHeaders; LLSD headers; av_name.mExpires = - LLAvatarNameCache::nameExpirationFromHeaders(headers); + LLAvatarNameCache::getInstance()->nameExpirationFromHeaders(headers); - LLAvatarNameCache::insert(agent_id, av_name); + LLAvatarNameCache::getInstance()->insert(agent_id, av_name); // force name tag to update LLVOAvatar::invalidateNameTag(agent_id); |