diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-15 17:30:21 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-15 17:34:48 +0300 |
commit | 725ae53bf59324f817f563ff053b837c10c52484 (patch) | |
tree | 4fed954dbbcfe4ca366a9efc115156ee37672f4b /indra/newview | |
parent | d8df532ac9d3f972e2b26bf551338fec2c2ee7a9 (diff) |
SL-443 Keybindings: Restored default fails to save
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llkeyconflict.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index b6107eeedf..d7a17b237e 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -730,13 +730,19 @@ void LLKeyConflictHandler::resetToDefault(const std::string &control_name, U32 i { return; } + LLKeyConflict &type_data = mControlsMap[control_name]; + if (!type_data.mAssignable) + { + return; + } LLKeyData data = getDefaultControl(control_name, index); - if (data != mControlsMap[control_name].getKeyData(index)) + if (data != type_data.getKeyData(index)) { // reset controls that might have been switched to our current control removeConflicts(data, mControlsMap[control_name].mConflictMask); mControlsMap[control_name].setKeyData(data, index); + mHasUnsavedChanges = true; } } |