From d857c3d40be3184fadc808a9687c307155bc01bb Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 16 Nov 2021 19:46:17 -0500
Subject: [PATCH] Move collision sound checkbox to sound pref panel
---
.../skins/default/xui/en/panel_preferences_move.xml | 9 ---------
.../skins/default/xui/en/panel_preferences_sound.xml | 11 +++++++++++
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 19508f9b242..745ca8759cd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -301,15 +301,6 @@
<combo_box.commit_callback
function="Pref.ClickActionChange"/>
</combo_box>
- <check_box
- control_name="EnableCollisionSounds"
- height="20"
- label="Play sound on collisions"
- layout="topleft"
- left="83"
- name="sound_on_collisions"
- top_pad="10"
- width="200" />
<button
height="23"
label="Other Devices"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 2ea20570b18..db3fc551980 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -377,6 +377,17 @@
label="Play sounds from gestures"
top_pad="1"
left="25"/>
+ <check_box
+ name="sound_on_collisions"
+ control_name="EnableCollisionSounds"
+ disabled_control="MuteAudio"
+ value="true"
+ follows="left|bottom|right"
+ height="15"
+ tool_tip="Check this to hear sounds from collisions with objects and avatars"
+ label="Play sounds from collisions"
+ top_pad="1"
+ left="25"/>
<text
type="string"
length="1"
--
GitLab