From 830bb207f0cc86b094522c80f34601bfc7ee1515 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 29 Oct 2020 18:33:15 +0000
Subject: [PATCH] crash avoidance (from BugSplat #18800)

---
 indra/newview/llviewerobject.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 90fbb4805c..856c8c35fd 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4642,7 +4642,8 @@ void LLViewerObject::setPositionRegion(const LLVector3 &pos_region, BOOL damped)
 	{
 		LLViewerObject::setPosition(pos_region);
 		mPositionRegion = pos_region;
-		mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+		if(mRegionp)// <FS:Beq/> Avoid crash when region null
+			mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
 	}
 }