diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:09 +0300 |
| commit | 80dd72ff2b30fd345482f0c2ede516e9b4bba8f3 (patch) | |
| tree | c4e90216ac4bd5082c15d0320d37b2938ea285ff /indra/llui/llscrolllistctrl.cpp | |
| parent | 42fa322e76757073ecc8e884f7fd0fb80e0dd4ad (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-514-keymappings
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 83f80cfb9e..208fc0a219 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -141,6 +141,7 @@ LLScrollListCtrl::Params::Params() can_sort("can_sort", true), mouse_wheel_opaque("mouse_wheel_opaque", false), commit_on_keyboard_movement("commit_on_keyboard_movement", true), + commit_on_selection_change("commit_on_selection_change", false), heading_height("heading_height"), page_lines("page_lines", 0), background_visible("background_visible"), @@ -171,7 +172,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) mMaxSelectable(0), mAllowKeyboardMovement(true), mCommitOnKeyboardMovement(p.commit_on_keyboard_movement), - mCommitOnSelectionChange(false), + mCommitOnSelectionChange(p.commit_on_selection_change), mSelectionChanged(false), mSelectionType(p.selection_type), mNeedsScroll(false), |