diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:31:14 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:31:14 -0800 |
| commit | 5e6868743fffa1e8c55b23237364c1e2c1350a08 (patch) | |
| tree | 9e5c276c338f5a88e63dda18f6c3b1184dd921bd /indra/newview/llfloaterpreference.cpp | |
| parent | 20d9a214681d9d8c00fe5e2a524bf0f9ed97fd5c (diff) | |
| parent | cb2febb0178901a6ac83fe688b056fcaac95b202 (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() |