From 82a3c185cd39646af861fe8355fa9539f7d3441e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Jan 2022 23:28:36 +0200
Subject: SL-16604 Double click teleport should ignore clicking own nametag

---
 indra/newview/lltoolpie.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 4f7511294d..6efed98fff 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -654,7 +654,8 @@ bool LLToolPie::teleportToClickedLocation()
     LLViewerObject* objp = mHoverPick.getObject();
     LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
 
-    if (objp->getAvatar() == gAgentAvatarp)
+    if (objp->getAvatar() == gAgentAvatarp
+        || objp == gAgentAvatarp) // ex: nametag
     {
         // Don't teleport to self, teleporting to other avatars is fine
         return false;
-- 
cgit v1.2.3