diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:45:14 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:45:14 -0400 |
commit | f4a772b2b8e70eb3ef3b734a7d3e1623e3f1be15 (patch) | |
tree | cc1759aeb34319f3af32085a7fc778fca7eda92d /indra/newview/llsidepaneltaskinfo.cpp | |
parent | 020757ff0170aa894c56cd719d46413c9e99fde6 (diff) | |
parent | 9db683c13e67575bd347cf8a795f1a4ee148c4ea (diff) |
DRTVWR-453: Update from MAINT (viewer-lynx).
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
-rw-r--r-- | indra/newview/llsidepaneltaskinfo.cpp | 2 |
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; } |