diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-11 19:02:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 19:02:27 +0200 |
| commit | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (patch) | |
| tree | 29df581352a6b0bfd1964b23c41b80db038f58a5 /indra/newview/llagent.cpp | |
| parent | f02a400134d83a12f43151c3dba32732bf88fd8c (diff) | |
| parent | 8bb35ac0299eae3c6cd71bedd0acb85d5819d462 (diff) | |
Merge branch 'release/2025.03' into marchcat/2025.03-maint-b
Diffstat (limited to 'indra/newview/llagent.cpp')
| -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; |