diff options
author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/llui/llscrolllistctrl.h | |
parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
parent | bd897431e14aff091d5f45425816ddec4b2538c7 (diff) |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
-rw-r--r-- | indra/llui/llscrolllistctrl.h | 4 |
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; |