summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-01-06 23:28:36 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-01-06 23:28:36 +0200
commit82a3c185cd39646af861fe8355fa9539f7d3441e (patch)
tree95b051cea506c9a8aa93708c9805ad3079e74d6d /indra
parentbc78cf0b5111c3f6588877e56239030f6e92b55a (diff)
SL-16604 Double click teleport should ignore clicking own nametag
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltoolpie.cpp3
1 files changed, 2 insertions, 1 deletions
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;