Separate sound for movelock toggling, with option to turn it on or off, suggested by Takoda

indra/newview/app_settings/settings.xml

@@ -15355,6 +15355,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <string>77a018af-098e-c037-51a6-178f05877c6f</string>
     </map>
+    <key>UISndMovelockToggle</key>
+    <map>
+      <key>Comment</key>
+      <string>Sound file for toggling movelock (uuid for sound asset)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>4174f859-0d3d-c517-c424-72923dc21f65</string>
+    </map>
     <key>UISndNewIncomingIMSession</key>
     <map>
       <key>Comment</key>
@@ -19942,6 +19953,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>PlayModeUISndMovelockToggle</key>
+    <map>
+      <key>Comment</key>
+      <string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndMovelockToggle.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>PlayModeUISndNewIncomingIMSession</key>
     <map>
       <key>Comment</key>

indra/newview/llviewermenu.cpp

@@ -4306,7 +4306,7 @@ class FSSelfToggleMoveLock : public view_listener_t
         {
 			if (LLGridManager::getInstance()->isInSecondLife())
 			{
-				make_ui_sound("UISndAlert");
+				make_ui_sound("UISndMovelockToggle");
 				bool new_value = !gSavedPerAccountSettings.getBOOL("UseMoveLock");
 				gSavedPerAccountSettings.setBOOL("UseMoveLock", new_value);
 				if (new_value)

indra/newview/skins/default/xui/de/panel_preferences_sound.xml

@@ -430,6 +430,13 @@ Der jeweilige Standardwert wird im Hovertip des UUID-Feldes angezeigt.
 		<button label="S" name="Def_UISndInvalidOp" tool_tip="Auf Standardwert zurücksetzen."/>
 		<check_box label="Abspielen" name="PlayModeUISndInvalidOp"/>
 
+		<text tool_tip="Sound UUID played on toggling movelock." name="textFSMovelockToggle">
+			Toggling movelock:
+		</text>
+		<button label="V" name="Prev_UISndMovelockToggle" tool_tip="Vorschau zu diesem Sound."/>
+		<button label="S" name="Def_UISndMovelockToggle" tool_tip="Auf Standardwert zurücksetzen."/>
+		<check_box label="Abspielen" name="PlayModeUISndMovelockToggle"/>
+
 		<text tool_tip="UUID des Klangs bei der Warnung vor einem Neustart der Region." name="textFSRestart">
 			Regionsneustart:
 		</text>

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

@@ -3487,6 +3487,62 @@ Hover your mouse cursor over UUID field to show its default value.
          left_pad="1"
          width="120" />
 
+        <text
+         layout="topleft"
+         follows="left|top"
+         top_pad="7"
+         left="5"
+         height="14"
+         width="150"
+         tool_tip="Sound UUID played on toggling movelock."
+         name="textFSMovelockToggle">
+            Toggling movelock:
+        </text>
+        <line_editor
+         tool_tip="4174f859-0d3d-c517-c424-72923dc21f65"
+         follows="left|top"
+         left_pad="5"
+         height="20"
+         max_length_chars="256"
+         name="UISndMovelockToggle"
+         control_name="UISndMovelockToggle"
+         width="218"/>
+        <button
+         follows="left|top"
+         name="Prev_UISndMovelockToggle"
+         height="20"
+         label="P"
+         layout="topleft"
+         top_delta="-1"
+         left_pad="1"
+         width="17"
+         tool_tip="Preview this sound.">
+		    <button.commit_callback
+             function="PreviewUISound"
+             parameter="UISndMovelockToggle"/>
+		</button>
+        <button
+         follows="left|top"
+         name="Def_UISndMovelockToggle"
+         height="20"
+         label="D"
+         layout="topleft"
+         left_pad="1"
+         width="15"
+         tool_tip="Reset to the default UUID.">
+		    <button.commit_callback
+             function="ResetControl"
+             parameter="UISndMovelockToggle"/>
+		</button>
+        <check_box
+         control_name="PlayModeUISndMovelockToggle"
+         height="20"
+         label="Play this sound"
+         layout="topleft"
+         name="PlayModeUISndMovelockToggle"
+         left_pad="1"
+         width="120" />
+
         <text
          layout="topleft"
          follows="left|top"

indra/newview/skins/default/xui/pl/panel_preferences_sound.xml

@@ -429,6 +429,13 @@ Przytrzymaj kursor myszki ponad polem na UUID, aby zobaczyć jego domyślną war
 			<button name="Def_UISndInvalidOp" tool_tip="Resetuj do domyślnego UUID."/>
 			<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndInvalidOp"/>
 
+			<text tool_tip="UUID dźwięku odgrywany, gdy włączane lub wyłączane jest unieruchamianie pozycji." name="textFSMovelockToggle">
+				Unieruchamianie pozycji:
+			</text>
+			<button name="Prev_UISndMovelockToggle" tool_tip="Podgląd dźwięku."/>
+			<button name="Def_UISndMovelockToggle" tool_tip="Resetuj do domyślnego UUID."/>
+			<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndMovelockToggle"/>
+
 			<text tool_tip="UUID dźwięku odgrywany, gdy pojawia się ostrzeżenie o restarcie regionu." name="textFSRestart">
 				Restart regionu:
 			</text>