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/llviewermessage.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/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 9a9d7a1baa..872a9a1581 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3602,7 +3602,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) U32 local_id; mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, local_id, i); - LLViewerObjectList::getUUIDFromLocal(id, local_id, ip, port); + gObjectList.getUUIDFromLocal(id, local_id, ip, port); if (id == LLUUID::null) { LL_DEBUGS("Messaging") << "Unknown kill for local " << local_id << LL_ENDL; |