From 76a1b181e6fd6ddaf89b53eab4de80477e11fa3d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 3 Mar 2022 16:40:00 +0200
Subject: [PATCH] SL-16970 FIXED Crash in LLToolPie::teleportToClickedLocation
---
indra/newview/lltoolpie.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 5e86c290cdf..43deac60d92 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -657,8 +657,7 @@ bool LLToolPie::teleportToClickedLocation()
LLViewerObject* objp = mHoverPick.getObject();
LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
- if (objp->getAvatar() == gAgentAvatarp
- || objp == gAgentAvatarp) // ex: nametag
+ if (objp && (objp->getAvatar() == gAgentAvatarp || objp == gAgentAvatarp)) // ex: nametag
{
// Don't teleport to self, teleporting to other avatars is fine
return false;
--
GitLab