diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-22 15:30:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 15:30:48 +0300 |
| commit | 3c7fc595fa974df80552ea5d7c738997a1ab3f51 (patch) | |
| tree | d2110d8cbe0b8c26e3ee72eedbd75f8186e50985 /indra/newview/llinventorybridge.cpp | |
| parent | 7ebbc58ae310b5c41efb3fe1460d63663ab92004 (diff) | |
| parent | 3013424057d8963bb55eca4bd58a91c21e4395fc (diff) | |
Merge pull request #2078 from RyeMutt/fix-rare-shutdown-crashes
Fix two rare shutdown crashes in gCacheName and gObjectList
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 0f2f0ec942..e40ab86010 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6293,7 +6293,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)) { |