summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepaneltaskinfo.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-06-13 20:28:26 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-06-13 20:28:26 +0300
commit5f890af7077157f7a0bf161d5aebf48dceb1a2ac (patch)
tree4745689929c3e621e62ba0b97ed0f226f969aad3 /indra/newview/llsidepaneltaskinfo.cpp
parent83dcf6b10daff1ec886063a968c884cdc79c47ed (diff)
MAINT-8731 Click action to disable clicking objects, per-object in a linkset
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
-rw-r--r--indra/newview/llsidepaneltaskinfo.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index f73722521a..f03c7abc4d 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -1130,6 +1130,8 @@ static U8 string_value_to_click_action(std::string p_value)
return CLICK_ACTION_OPEN;
if (p_value == "Zoom")
return CLICK_ACTION_ZOOM;
+ if (p_value == "None")
+ return CLICK_ACTION_DISABLED;
return CLICK_ACTION_TOUCH;
}