diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 21:58:43 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 21:58:43 +0300 |
| commit | 35708568d684b2619e1cfcf66213c93a98fd1ab2 (patch) | |
| tree | ada790d45e18aa5432e14a7c300f0bc15c68e00b /indra/llui/llscrolllistctrl.h | |
| parent | fa52c0393901389b45c2d73033165cf8bc0ced98 (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 43e1c0d707..8d00296183 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -97,6 +97,7 @@ public: // behavioral flags Optional<bool> multi_select, commit_on_keyboard_movement, + commit_on_selection_change, mouse_wheel_opaque; // display flags |