diff options
| author | Maxim Nikolenko <mnikolenko@productengine.com> | 2025-03-11 12:27:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 12:27:01 +0200 |
| commit | 8bb35ac0299eae3c6cd71bedd0acb85d5819d462 (patch) | |
| tree | 194fcf9ffaa8aeb7a703a9554a3a32f921d631b6 | |
| parent | 716e09cffeea638f3fa26737d33ba1c4c3532473 (diff) | |
| parent | 179f46c18fa88ce9913d247fd3ba5908f26d779b (diff) | |
Merge pull request #3711 from secondlife/maxim/2025.03-3702
#3702 Crash at doTeleportViaLandmark
| -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; |