From 73a1877ff0abcba46f66ef55440274119427723b Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 7 Nov 2019 20:09:25 +0200 Subject: 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 --- indra/newview/llkeyconflict.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'indra/newview/llkeyconflict.cpp') 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()) { -- cgit v1.2.3