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/llfloaterdisplayname.cpp | |
parent | b1ac8092eecf5fc9dc4b4867370a51e5dfba4331 (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterdisplayname.cpp')
-rw-r--r-- | indra/newview/llfloaterdisplayname.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterdisplayname.cpp b/indra/newview/llfloaterdisplayname.cpp index 596e8c0dbe..e6742727d6 100644 --- a/indra/newview/llfloaterdisplayname.cpp +++ b/indra/newview/llfloaterdisplayname.cpp @@ -160,7 +160,7 @@ void LLFloaterDisplayName::onCancel() void LLFloaterDisplayName::onReset() { - if (LLAvatarNameCache::hasNameLookupURL()) + if (LLAvatarNameCache::getInstance()->hasNameLookupURL()) { LLViewerDisplayName::set("",boost::bind(&LLFloaterDisplayName::onCacheSetName, this, _1, _2, _3)); } @@ -194,7 +194,7 @@ void LLFloaterDisplayName::onSave() return; } - if (LLAvatarNameCache::hasNameLookupURL()) + if (LLAvatarNameCache::getInstance()->hasNameLookupURL()) { LLViewerDisplayName::set(display_name_utf8,boost::bind(&LLFloaterDisplayName::onCacheSetName, this, _1, _2, _3)); } |