diff options
| author | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
| commit | 0b1ed9af5f32c7869cdf05763e4d6d5730b66327 (patch) | |
| tree | 986e2baeee191338dcb3c063af80992b47f1ddb9 /indra/newview/llfloaterpreference.cpp | |
| parent | 399e922d33ae36d415431a512020771e058454cd (diff) | |
| parent | 3c1c0d7544805df7d77b7f2af4ab1f83ebf0839c (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 8b3391726a..a199da3b00 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1043,11 +1043,15 @@ void LLFloaterPreference::onClickSetKey() void LLFloaterPreference::setKey(KEY key) { childSetValue("modifier_combo", LLKeyboard::stringFromKey(key)); + // update the control right away since we no longer wait for apply + getChild<LLUICtrl>("modifier_combo")->onCommit(); } void LLFloaterPreference::onClickSetMiddleMouse() { childSetValue("modifier_combo", "MiddleMouse"); + // update the control right away since we no longer wait for apply + getChild<LLUICtrl>("modifier_combo")->onCommit(); } void LLFloaterPreference::onClickSkipDialogs() |