From 4b74b82f8d1d0b9fb57dd21e6bf3caad410dd691 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 29 Sep 2023 22:17:37 +0300
Subject: SL-20367 Click actions Zoom and Ignore can't be set from object's
 profile

---
 indra/newview/llsidepaneltaskinfo.cpp                      | 13 ++++++++-----
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 225751ab92..1103db9baa 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -855,11 +855,12 @@ void LLSidepanelTaskInfo::refresh()
 	U8 click_action = 0;
 	if (LLSelectMgr::getInstance()->selectionGetClickAction(&click_action))
 	{
-		LLComboBox*	ComboClickAction = getChild<LLComboBox>("clickaction");
-		if (ComboClickAction)
-		{
-			ComboClickAction->setCurrentByIndex((S32)click_action);
-		}
+        if (click_action > CLICK_ACTION_OPEN_MEDIA)
+        {
+            // Doesn't list media, nor play
+            click_action -= 2;
+        }
+        getChild<LLComboBox>("clickaction")->setCurrentByIndex((S32)click_action);
 	}
 	getChildView("label click action")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume);
 	getChildView("clickaction")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume);
@@ -1143,6 +1144,8 @@ static U8 string_value_to_click_action(std::string p_value)
 		return CLICK_ACTION_ZOOM;
 	if (p_value == "None")
 		return CLICK_ACTION_DISABLED;
+    if (p_value == "Ignore")
+        return CLICK_ACTION_IGNORE;
 	return CLICK_ACTION_TOUCH;
 }
 
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 5f0241512a..91325369f5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -299,14 +299,14 @@
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
-                <combo_box.item
-                 label="Ignore object"
-                 name="Ignoreobject"
-                 value="Ignore" />
                 <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
+                <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
             </combo_box>
 	 <panel
          border="false"
-- 
cgit v1.2.3