Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore object kills if our region is null

Browse Source 
Fixes crash 1R
This commit is contained in:
Liru Færs
2020-01-12 20:06:01 -05:00
parent 0da16e6034
commit de47736038
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewermessage.cpp
View File

@@ -5269,6 +5269,9 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
{ {
LL_RECORD_BLOCK_TIME(FTM_PROCESS_OBJECTS); LL_RECORD_BLOCK_TIME(FTM_PROCESS_OBJECTS);
auto agent_region = gAgent.getRegion();
if (!agent_region) return;
LLUUID id; LLUUID id;
U32 local_id; U32 local_id;
S32 i; S32 i;
@@ -5276,7 +5279,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
num_objects = mesgsys->getNumberOfBlocksFast(_PREHASH_ObjectData); 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++) for (i = 0; i < num_objects; i++)
{ {