From 510e1b9e0ec14e98793041b9560694454a9aec2b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 12 Sep 2012 19:44:53 +0200
Subject: [PATCH] Possible crash fix in LLAgent::doTeleportViaLocation

---
 indra/newview/llagent.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 447836910d2..11fa50b51a7 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4045,6 +4045,12 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
 {
 	LLViewerRegion* regionp = getRegion();
+
+	if (!regionp)
+	{
+		return;
+	}
+
 	U64 handle = to_region_handle(pos_global);
 	LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle);
 	if(regionp && info)
-- 
GitLab