Skip to content

Commit 8bb35ac

Browse files
Merge pull request #3711 from secondlife/maxim/2025.03-3702
#3702 Crash at doTeleportViaLandmark
2 parents 716e09c + 179f46c commit 8bb35ac

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

indra/newview/llagent.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4321,9 +4321,14 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
43214321

43224322
void LLAgent::doTeleportViaLandmark(const LLUUID& landmark_asset_id)
43234323
{
4324-
bool is_local(false);
4325-
LLViewerRegion* regionp = getRegion();
4324+
LLViewerRegion* regionp = getRegion();
4325+
if (!regionp)
4326+
{
4327+
LL_WARNS("Teleport") << "called when agent region is null" << LL_ENDL;
4328+
return;
4329+
}
43264330

4331+
bool is_local(false);
43274332
if (LLLandmark* landmark = gLandmarkList.getAsset(landmark_asset_id, NULL))
43284333
{
43294334
LLVector3d pos_global;

0 commit comments

Comments
 (0)