summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-12 21:14:45 +0200
committerGitHub <noreply@github.com>2024-03-12 21:14:45 +0200
commit6b285674bba145dd70b90a06248ba8dd7fdc474a (patch)
tree110015e1703b331715fbf7fb1a01639c74c47e62 /indra/llui/llscrollcontainer.h
parent748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff)
parenteb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff)
Merge main into DRTVWR-600-maint-A
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
-rw-r--r--indra/llui/llscrollcontainer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 13f69cb83b..a9191714e8 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -63,7 +63,8 @@ public:
Optional<bool> is_opaque,
reserve_scroll_corner,
border_visible,
- hide_scrollbar;
+ hide_scrollbar,
+ ignore_arrow_keys;
Optional<F32> min_auto_scroll_rate,
max_auto_scroll_rate;
Optional<U32> max_auto_scroll_zone;
@@ -149,6 +150,7 @@ private:
F32 mMaxAutoScrollRate;
U32 mMaxAutoScrollZone;
bool mHideScrollbar;
+ bool mIgnoreArrowKeys;
};