diff options
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d7a8f9fd4f..0af6249351 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -167,7 +167,7 @@ static const U32 ALLOW_KEYS = 4; //keyboard static const U32 ALLOW_MASK_KEYS = 8; static const U32 ALLOW_MASKS = 16; static const U32 CAN_IGNORE_MASKS = 32; // For example W (aka Forward) should work regardless of SHIFT being pressed -static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS; +static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS | CAN_IGNORE_MASKS; class LLSetKeyBindDialog : public LLModalDialog { @@ -2919,6 +2919,10 @@ LLPanelPreferenceControls::LLPanelPreferenceControls() mEditingMode(0), mShowKeyDialog(false) { + for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT; ++i) + { + mConflictHandler[i].setLoadMode((LLKeyConflictHandler::EModes)i); + } } LLPanelPreferenceControls::~LLPanelPreferenceControls() @@ -3243,7 +3247,10 @@ void LLPanelPreferenceControls::onSetKeyBind(EMouseClickType click, KEY key, MAS void LLPanelPreferenceControls::onRestoreDefaults() { - mConflictHandler[mEditingMode].resetToDefaults(); + for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT; ++i) + { + mConflictHandler[mEditingMode].resetToDefaults(); + } populateControlTable(); } |