summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-12 09:53:17 -0700
committerRichard Linden <none@none>2010-08-12 09:53:17 -0700
commit402e2a181831d30a6a2586fd4b0641ba66da99be (patch)
tree335f57714bbc00510ede9e60c3d363722ef6ee43 /indra/llui/llscrolllistctrl.h
parentbe50a053ed4ae7d0b15fc20f1c6ca0973c56ffd9 (diff)
parent4e8c33e7252d38d00b5606e1960aa520c75e0227 (diff)
merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
-rw-r--r--indra/llui/llscrolllistctrl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 1f0ef585db..19cb7e2bfe 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -102,7 +102,8 @@ public:
{
// behavioral flags
Optional<bool> multi_select,
- commit_on_keyboard_movement;
+ commit_on_keyboard_movement,
+ mouse_wheel_opaque;
// display flags
Optional<bool> has_border,
@@ -449,6 +450,7 @@ private:
BOOL mCommitOnSelectionChange;
BOOL mSelectionChanged;
BOOL mNeedsScroll;
+ BOOL mMouseWheelOpaque;
BOOL mCanSelect;
const BOOL mDisplayColumnHeaders;
BOOL mColumnsDirty;