diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-11 02:27:22 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-11 02:30:30 +0200 |
| commit | 03a7ec55c922588fb0efa17de8e1c794bd08572d (patch) | |
| tree | 6fbb0f4b27a82030702975b20e9ddcce3e1e8303 /indra/newview | |
| parent | 469ce7f7f6828aa8ed8d45fdff82cb33c1ec655d (diff) | |
Revert "SL-11841 make ‘Push to talk’ the default setting"
+ post merge conflict fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/key_bindings.xml | 9 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/key_bindings.xml index 2ec9a2586c..1a5157838c 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="voice_follow_key"/> + <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> </first_person> <third_person> <binding key="A" mask="NONE" command="turn_left"/> @@ -125,8 +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="voice_follow_key"/> - <binding key="" mask="NONE" mouse="LMB" command="walk_to"/> + <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> </third_person> <sitting> <binding key="A" mask="ALT" command="spin_around_cw"/> @@ -223,7 +222,7 @@ <binding key="ENTER" mask="NONE" command="start_chat"/> <binding key="DIVIDE" mask="NONE" command="start_gesture"/> - <binding key="" mask="NONE" mouse="MMB" command="voice_follow_key"/> + <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> </sitting> <edit_avatar> <!--Avatar editing camera controls--> @@ -250,6 +249,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="voice_follow_key"/> + <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/> </edit_avatar> </keys> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dc8c7b7967..73fa8e0b61 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8341,13 +8341,13 @@ <key>PushToTalkToggle</key> <map> <key>Comment</key> - <string>Should the push-to-talk toolbar button behave as a toggle</string> + <string>Should the push-to-talk button behave as a toggle</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>QAMode</key> <map> |