diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 16:43:35 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 16:43:35 -0800 |
| commit | 967e171ed67449b9e97c16425df9114e4c7dd48c (patch) | |
| tree | 9ffdf1183777390407ad57ba900e557a60c039fb /indra/newview/llfloaterpreference.cpp | |
| parent | 44eea89d001ccb09343dda973af0dabecb1ec48d (diff) | |
| parent | 345c2a02cd1ba7d9e266c6c991d90d15ac7d4b52 (diff) | |
merge from remote repo
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() |