diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-07-21 20:10:21 -0400 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-08-09 22:55:08 +0300 |
| commit | 9e4185bf75edbbf313735be56b1aaefcf0d31299 (patch) | |
| tree | 0a2da1e123f4e4c4c8d03b72a0511c1b1201b875 /indra/newview | |
| parent | fe76026a3fea79522083864019026e6bf01777df (diff) | |
Fix rare shutdown crash in gCacheName
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 6087e6c0ee..08a54b7369 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -300,7 +300,7 @@ void LLFloaterAvatarPicker::populateNearMe() if (!LLAvatarNameCache::get(av, &av_name)) { element["columns"][0]["column"] = "name"; - element["columns"][0]["value"] = LLCacheName::getDefaultName(); + element["columns"][0]["value"] = gCacheName->getDefaultName(); all_loaded = false; } else diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 33d0ac891d..bfa8e39b70 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6289,7 +6289,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act if (item && (item->getCreatorUUID() != gAgent.getID()) && (!item->getCreatorUUID().isNull())) { - std::string callingcard_name = LLCacheName::getDefaultName(); + std::string callingcard_name = gCacheName->getDefaultName(); LLAvatarName av_name; if (LLAvatarNameCache::get(item->getCreatorUUID(), &av_name)) { |