summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-10-14 16:23:05 -0600
committerDave Houlton <euclid@lindenlab.com>2020-10-14 16:23:05 -0600
commit317ff2ce6241b9eaccacbc27117351ebc3d5eea7 (patch)
tree2f162a12cd3b0878fca6d1d37124ef5adb2fa7f7 /indra/llui/llscrolllistctrl.cpp
parent846fc179b13ba06fe9a51be69d80e86d0f433a73 (diff)
parent52af846672d1d4f1cb9ccd46239cff9c81400ed5 (diff)
Merged 6.4.11 into DRTVWR-510
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 763c3aeb81..367c6c3c5b 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -132,6 +132,7 @@ LLScrollListCtrl::Params::Params()
sort_ascending("sort_ascending", 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"),
@@ -162,7 +163,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),
mNeedsScroll(false),
mCanSelect(true),