diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:11:07 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:11:07 -0800 |
commit | 43c5ab0be2bf165c660439c3449247454d37e368 (patch) | |
tree | abff0df76c30c0f45a1626db3b49dfc95c4ed1f5 /indra/newview/llfloaterpreference.cpp | |
parent | d28e37b9fc0413a24e75a2a7c78a109abbe67330 (diff) |
EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810 Right clicking own avatar displayed semi-transparent menus
EXT-1927 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
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() |