From c65bbadb2f6bc6828c149e3c468473a8c12d094c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 21 Jul 2024 20:10:02 -0400
Subject: Fix rare shutdown crash in LLViewerObjectList

---
 indra/newview/llviewerobject.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llviewerobject.cpp')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index e108f9c268..9ad2474e9b 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1940,14 +1940,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
                 if(mesgsys != NULL)
                 {
-                LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                    gObjectList.getUUIDFromLocal(parent_uuid,
                                                         parent_id,
                                                         mesgsys->getSenderIP(),
                                                         mesgsys->getSenderPort());
                 }
                 else
                 {
-                    LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                    gObjectList.getUUIDFromLocal(parent_uuid,
                                                         parent_id,
                                                         mRegionp->getHost().getAddress(),
                                                         mRegionp->getHost().getPort());
@@ -2062,7 +2062,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
                 // Debugging for suspected problems with local ids.
                 //LLUUID parent_uuid;
-                //LLViewerObjectList::getUUIDFromLocal(parent_uuid, parent_id, mesgsys->getSenderIP(), mesgsys->getSenderPort() );
+                //gObjectList.getUUIDFromLocal(parent_uuid, parent_id, mesgsys->getSenderIP(), mesgsys->getSenderPort() );
                 //if (parent_uuid != cur_parentp->getID() )
                 //{
                 //  LL_ERRS() << "Local ID match but UUID mismatch of viewer object" << LL_ENDL;
@@ -2085,14 +2085,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
                     if(mesgsys != NULL)
                     {
-                    LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                        gObjectList.getUUIDFromLocal(parent_uuid,
                                                         parent_id,
                                                         gMessageSystem->getSenderIP(),
                                                         gMessageSystem->getSenderPort());
                     }
                     else
                     {
-                        LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                        gObjectList.getUUIDFromLocal(parent_uuid,
                                                         parent_id,
                                                         mRegionp->getHost().getAddress(),
                                                         mRegionp->getHost().getPort());
-- 
cgit v1.2.3