diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-17 23:18:58 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-18 00:08:27 +0300 |
| commit | ce660c7e7bb6e19a23d634fb6d3249330bf2d74c (patch) | |
| tree | 625a5f4921fed139e3e91fed36e72a77d9c4a739 /indra | |
| parent | 28e07331acf45edb380c094179cef6ea5adeb010 (diff) | |
SL-11841 Fix PushToTalkToggle being set incorectly
Due to changed defaults, legacy compatibility will no longer work corectly, remove it
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 24 | ||||
| -rw-r--r-- | indra/newview/llkeyconflict.cpp | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ecd62cadf8..573cca248c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4562,11 +4562,6 @@ void LLAppViewer::loadKeyBindings() LLKeyboard::keyFromString(key_string, &key); } - value = gSavedSettings.getBOOL("PushToTalkToggle"); - std::string control_name = value ? "toggle_voice" : "voice_follow_key"; - third_person_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - sitting_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - if (third_person_view.hasUnsavedChanges()) { // calls loadBindingsXML() @@ -4578,25 +4573,6 @@ void LLAppViewer::loadKeyBindings() // calls loadBindingsXML() sitting_view.saveToSettings(); } - - // in case of voice we need to repeat this in other modes - - for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i) - { - // edit and first person modes; MODE_SAVED_SETTINGS not in use at the moment - if (i != LLKeyConflictHandler::MODE_THIRD_PERSON && i != LLKeyConflictHandler::MODE_SITTING) - { - LLKeyConflictHandler handler((LLKeyConflictHandler::ESourceMode)i); - - handler.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - - if (handler.hasUnsavedChanges()) - { - // calls loadBindingsXML() - handler.saveToSettings(); - } - } - } } // since something might have gone wrong or there might have been nothing to save // (and because otherwise following code will have to be encased in else{}), diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index b6107eeedf..52e14d48f7 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -644,7 +644,6 @@ void LLKeyConflictHandler::saveToSettings(bool temporary) data = getControl("voice_follow_key", 0); } - gSavedSettings.setBOOL("PushToTalkToggle", can_toggle); if (data.isEmpty()) { // legacy viewer has a bug that might crash it if NONE value is assigned. |