diff options
| author | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
| commit | 73952a37ed7a11331154f2f68050286722ec96da (patch) | |
| tree | 7ce6c9f6d0c3f6b0e85efc57736340106329beb4 /indra/llui/llscrolllistctrl.h | |
| parent | e16c1f6fdd300f284f0b39b76b4e82f7366b5cdb (diff) | |
| parent | 402e2a181831d30a6a2586fd4b0641ba66da99be (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; |