diff options
| -rw-r--r-- | indra/newview/llagent.cpp | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index ed82f1db48..2161dbe19e 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4321,9 +4321,14 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)  void LLAgent::doTeleportViaLandmark(const LLUUID& landmark_asset_id)  { -    bool is_local(false); -    LLViewerRegion* regionp  = getRegion(); +    LLViewerRegion* regionp = getRegion(); +    if (!regionp) +    { +        LL_WARNS("Teleport") << "called when agent region is null" << LL_ENDL; +        return; +    } +    bool is_local(false);      if (LLLandmark* landmark = gLandmarkList.getAsset(landmark_asset_id, NULL))      {          LLVector3d pos_global;  | 
