diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-21 16:04:33 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-21 19:36:44 +0800 |
| commit | 2fb48eb9be6df00c3baed955fd84f4d8a1ea1d9a (patch) | |
| tree | b6ba5ff2c3ebc24477e3c6d701f91672c7499132 /indra/newview/llagent.cpp | |
| parent | 0cdb7d97f67b3a67097e56e71021cb6120ec8a8b (diff) | |
| parent | 895a6739d3d02e11750e9ada72b730d02998d4c0 (diff) | |
Merge tag 'Second_Life_Release#895a6739-2025.03' into 2025.03
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; |