From b661f62a7ad4dad9806eda8f4c8f2c9d64b3efbb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Sep 2021 23:10:48 +0300
Subject: [PATCH] =?UTF-8?q?SL-11841=20make=20=E2=80=98Push=20to=20talk?=
=?UTF-8?q?=E2=80=99=20the=20default=20setting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
indra/newview/app_settings/key_bindings.xml | 8 ++++----
indra/newview/app_settings/settings.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/key_bindings.xml
index 4f6deb1f985..2ec9a2586c6 100644
--- a/indra/newview/app_settings/key_bindings.xml
+++ b/indra/newview/app_settings/key_bindings.xml
@@ -32,7 +32,7 @@
<binding key="ENTER" mask="NONE" command="start_chat"/>
<binding key="DIVIDE" mask="NONE" command="start_gesture"/>
- <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
+ <binding key="" mask="NONE" mouse="MMB" command="voice_follow_key"/>
</first_person>
<third_person>
<binding key="A" mask="NONE" command="turn_left"/>
@@ -125,7 +125,7 @@
<binding key="PAD_ENTER" mask="CTL_ALT_SHIFT" command="start_chat"/>
<binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
- <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
+ <binding key="" mask="NONE" mouse="MMB" command="voice_follow_key"/>
<binding key="" mask="NONE" mouse="LMB" command="walk_to"/>
</third_person>
<sitting>
@@ -223,7 +223,7 @@
<binding key="ENTER" mask="NONE" command="start_chat"/>
<binding key="DIVIDE" mask="NONE" command="start_gesture"/>
- <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
+ <binding key="" mask="NONE" mouse="MMB" command="voice_follow_key"/>
</sitting>
<edit_avatar>
<!--Avatar editing camera controls-->
@@ -250,6 +250,6 @@
<binding key="PAD_ENTER" mask="NONE" command="start_chat"/>
<binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/>
- <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
+ <binding key="" mask="NONE" mouse="MMB" command="voice_follow_key"/>
</edit_avatar>
</keys>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0acedf9a399..952b36adea0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8308,7 +8308,7 @@
<key>PushToTalkToggle</key>
<map>
<key>Comment</key>
- <string>Should the push-to-talk button behave as a toggle</string>
+ <string>Should the push-to-talk toolbar button behave as a toggle</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
--
GitLab