diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:47:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:47:08 +0100 |
| commit | 4db872e11ea5d322c20de9ddde484cb39690c1a2 (patch) | |
| tree | 742c8d48a2a33c973f7ec0f2f20cab4e806bcb3c /indra/llui/llscrolllistctrl.h | |
| parent | 78e7bde7ac65821084cb13a6a58b4f049e436be1 (diff) | |
| parent | ff6eccd32db0cf57e16db8941b25a12dbb64b9fa (diff) | |
merge from PE's viewer-trunk
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; |