From 3d9406a21ebf54eb6c20a4a33a9967dae3c55176 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 27 Oct 2014 16:21:44 +0200
Subject: [PATCH] MAINT-2759 FIXED Touch is greyed out when right clicking on
child prims in a touchable linkset if the script uses a reset on rez
---
indra/newview/llviewermenu.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ecf5cc28863..4cd60336b33 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2580,9 +2580,13 @@ static LLStringExplicit get_default_item_label(const std::string& item_name)
bool enable_object_touch(LLUICtrl* ctrl)
{
+ bool new_value = false;
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-
- bool new_value = obj && obj->flagHandleTouch();
+ if (obj)
+ {
+ LLViewerObject* parent = (LLViewerObject*)obj->getParent();
+ new_value = obj->flagHandleTouch() || (parent && parent->flagHandleTouch());
+ }
std::string item_name = ctrl->getName();
init_default_item_label(item_name);
--
GitLab