summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
commitdbe965eaa1864ff71e365608488a5015172a24ed (patch)
treef3a7f10360a50a09ca1267fd204802507b079a17 /indra/llui/llscrolllistctrl.h
parent6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff)
parent838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff)
Sync with viewer-development
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 30618866af..8a2f893ba2 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -96,7 +96,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,
@@ -443,6 +444,7 @@ private:
BOOL mCommitOnSelectionChange;
BOOL mSelectionChanged;
BOOL mNeedsScroll;
+ BOOL mMouseWheelOpaque;
BOOL mCanSelect;
const BOOL mDisplayColumnHeaders;
BOOL mColumnsDirty;