diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-07 20:09:25 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:50:04 +0300 |
| commit | 73a1877ff0abcba46f66ef55440274119427723b (patch) | |
| tree | d5596bda308601325576aab40faddefdf6a30edc /indra/newview/llkeyconflict.cpp | |
| parent | b5b266c4d2bdf71d89f5d2545e7d6e7966082c90 (diff) | |
SL-6109
- Edit mode appears to be obsolete and is not used, cleaned up
- Improved ability to set defaults
- Improved some labels
- Made buttons bigger to accomodate languages with longer descriptions
- Added ability to assign key for all modes simultaneously
Diffstat (limited to 'indra/newview/llkeyconflict.cpp')
| -rw-r--r-- | indra/newview/llkeyconflict.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index d9c2b3d53a..b4f5ec4d57 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -345,13 +345,6 @@ bool LLKeyConflictHandler::loadFromSettings(const ESourceMode &load_mode, const res = true; } break; - case MODE_EDIT: - if (keys.edit.isProvided()) - { - loadFromSettings(keys.edit, destination); - res = true; - } - break; case MODE_EDIT_AVATAR: if (keys.edit_avatar.isProvided()) { @@ -553,12 +546,6 @@ void LLKeyConflictHandler::saveToSettings(bool temporary) keys.third_person.bindings.set(mode.bindings, true); } break; - case MODE_EDIT: - if (keys.edit.isProvided()) - { - keys.edit.bindings.set(mode.bindings, true); - } - break; case MODE_EDIT_AVATAR: if (keys.edit_avatar.isProvided()) { |