summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-03-10 15:36:58 -0700
committerRoxie Linden <roxie@lindenlab.com>2024-03-10 15:36:58 -0700
commitd67a3022d3a9432f279768371b27ea5322315905 (patch)
tree0254d8a7889ff6639cf6bf9b40f63499df37ceb4 /indra/llui/llscrollcontainer.h
parentfc462b2b0f7ee153626d162bd97a05110f0804b7 (diff)
parentb242d696ba03f66494dfca1f05a74ed1b15cd6e4 (diff)
Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice
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;
};