diff options
| author | Ansariel Hiller <ansarielhiller@yahoo.de> | 2019-11-09 15:06:09 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:50:04 +0300 |
| commit | 9b218acc351cdd2eb06a9f87951314e0eb34daa9 (patch) | |
| tree | 325bb977c9c2a5f801f9b0f14394c4af1c595dd9 /indra/newview/llkeyconflict.cpp | |
| parent | 73a1877ff0abcba46f66ef55440274119427723b (diff) | |
Fix custom user keybindings not being displayed in preferences correctly
Diffstat (limited to 'indra/newview/llkeyconflict.cpp')
| -rw-r--r-- | indra/newview/llkeyconflict.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index b4f5ec4d57..121965a388 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -124,6 +124,10 @@ EMouseClickType mouse_from_string(const std::string& input) { return CLICK_BUTTON5; } + if (input == "Double LMB") + { + return CLICK_DOUBLELEFT; + } return CLICK_NONE; } @@ -396,7 +400,7 @@ void LLKeyConflictHandler::loadFromSettings(ESourceMode load_mode) // load user's filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_default); - if (!gDirUtilp->fileExists(filename) || loadFromSettings(load_mode, filename, &mControlsMap)) + if (!gDirUtilp->fileExists(filename) || !loadFromSettings(load_mode, filename, &mControlsMap)) { // mind placeholders mControlsMap.insert(mDefaultsMap.begin(), mDefaultsMap.end()); |