From de47736038ec97ca5e16bb497d16d8366e5126e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 12 Jan 2020 20:06:01 -0500 Subject: [PATCH] Ignore object kills if our region is null Fixes crash 1R --- indra/newview/llviewermessage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 648d46990..3211dbead 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5269,6 +5269,9 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) { LL_RECORD_BLOCK_TIME(FTM_PROCESS_OBJECTS); + auto agent_region = gAgent.getRegion(); + if (!agent_region) return; + LLUUID id; U32 local_id; S32 i; @@ -5276,7 +5279,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) num_objects = mesgsys->getNumberOfBlocksFast(_PREHASH_ObjectData); - bool different_region = mesgsys->getSender().getIPandPort() != gAgent.getRegion()->getHost().getIPandPort(); + bool different_region = mesgsys->getSender().getIPandPort() != agent_region->getHost().getIPandPort(); for (i = 0; i < num_objects; i++) {