summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-03-08 11:40:36 -0500
committerNat Goodspeed <nat@lindenlab.com>2024-03-08 11:40:36 -0500
commitc12a3c9f5bc085a67ef0fc2c764a9692bcab2b66 (patch)
treebad63257eacc0d137c5ea74b153cba600867e353 /indra/llui/llscrollcontainer.h
parentefdda0b93d2dbf28e7722150028476286f0ec623 (diff)
parentee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff)
Merge 'release/luau-scripting' into lua-leap for Emoji release.
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 dacea2a987..79dc70cac9 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;
};