diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
| commit | 235afd7836d74305292067cd6c29fe0192d6201d (patch) | |
| tree | 2cb0f2f9c817b9f70db8e115aaf69990555210ea /indra/llui/llscrolllistctrl.h | |
| parent | c90a90407c30415bf9700d3b037a0b8918e261d3 (diff) | |
| parent | 011c3686a6e10edfe40adb67105298033188c1d6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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; |