summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAnsariel <none@none>2012-09-12 19:44:53 +0200
committerAnsariel <none@none>2012-09-12 19:44:53 +0200
commit510e1b9e0ec14e98793041b9560694454a9aec2b (patch)
tree68d9a6cfbb0a072e7182b21c6007ec683f25150f /indra
parent1282cd91d18fe74016b58474b7d3afbc99c29aac (diff)
Possible crash fix in LLAgent::doTeleportViaLocation
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llagent.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 447836910d..11fa50b51a 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)