diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dae7f52450..e5c47521d9 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13879,6 +13879,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UISndFootsteps</key>
+    <map>
+      <key>Comment</key>
+      <string>Sound file for default footsteps (uuid for sound asset). Change requires restart to take effect.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>e8af4a28-aa83-4310-a7c4-c047e15ea0df</string>
+    </map>
     <key>UISndFriendOffline</key>
     <map>
       <key>Comment</key>
@@ -18222,6 +18233,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>PlayModeUISndFootsteps</key>
+    <map>
+      <key>Comment</key>
+      <string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndFootsteps.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>PlayModeUISndFriendOffline</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bc4a3bccae..603b58ff3b 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -623,7 +623,7 @@ F32 LLVOAvatar::sRenderDistance = 256.f;
 S32	LLVOAvatar::sNumVisibleAvatars = 0;
 S32	LLVOAvatar::sNumLODChangesThisFrame = 0;
 
-const LLUUID LLVOAvatar::sStepSoundOnLand("e8af4a28-aa83-4310-a7c4-c047e15ea0df");
+// const LLUUID LLVOAvatar::sStepSoundOnLand("e8af4a28-aa83-4310-a7c4-c047e15ea0df"); - <FS:PP> Commented out for FIRE-3169: Option to change the default footsteps sound
 const LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] =
 {
 	SND_STONE_RUBBER,
@@ -4193,7 +4193,11 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 		mWasOnGroundLeft = onGroundLeft;
 		mWasOnGroundRight = onGroundRight;
 
-		if ( playSound )
+		// <FS:PP> FIRE-3169: Option to change the default footsteps sound
+		// if ( playSound )
+		static LLCachedControl<bool> PlayModeUISndFootsteps(gSavedSettings, "PlayModeUISndFootsteps");
+		if ( playSound && PlayModeUISndFootsteps )
+		// </FS:PP>
 		{
 //			F32 gain = clamp_rescale( mSpeedAccum,
 //							AUDIO_STEP_LO_SPEED, AUDIO_STEP_HI_SPEED,
@@ -5081,7 +5085,12 @@ const LLUUID& LLVOAvatar::getStepSound() const
 {
 	if ( mStepOnLand )
 	{
-		return sStepSoundOnLand;
+		// <FS:PP> FIRE-3169: Option to change the default footsteps sound
+		// return sStepSoundOnLand;
+		static LLCachedControl<std::string> UISndFootsteps(gSavedSettings, "UISndFootsteps");
+		static const LLUUID sFootstepsSnd = LLUUID(UISndFootsteps);
+		return sFootstepsSnd;
+		// </FS:PP>
 	}
 
 	return sStepSounds[mStepMaterial];
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 9b5e3e03b5..ee5d84428a 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -999,7 +999,7 @@ protected:
 private:
 	// Global table of sound ids per material, and the ground
 	const static LLUUID	sStepSounds[LL_MCODE_END];
-	const static LLUUID	sStepSoundOnLand;
+	// const static LLUUID	sStepSoundOnLand; - <FS:PP> Commented out for FIRE-3169: Option to change the default footsteps sound
 
 	//--------------------------------------------------------------------
 	// Foot step state (for generating sounds)
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 02b89e8587..cf4e513884 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2956,6 +2956,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 default footsteps. Change requires restart to take effect."
+         name="textFSFootsteps">
+            Default footsteps:
+        </text>
+        <line_editor
+         tool_tip="e8af4a28-aa83-4310-a7c4-c047e15ea0df"
+         follows="left|top"
+         left_pad="5"
+         height="20"
+         max_length_chars="256"
+         name="UISndFootsteps"
+         control_name="UISndFootsteps"
+         width="218"/>
+        <button
+         follows="left|top"
+         name="Prev_UISndFootsteps"
+         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="UISndFootsteps"/>
+        </button>
+        <button
+         follows="left|top"
+         name="Def_UISndFootsteps"
+         height="20"
+         label="D"
+         layout="topleft"
+         left_pad="1"
+         width="15"
+         tool_tip="Reset to the default UUID.">
+           <button.commit_callback
+             function="ResetControl"
+             parameter="UISndFootsteps"/>
+        </button>
+        <check_box
+         control_name="PlayModeUISndFootsteps"
+         height="20"
+         label="Play this sound"
+         layout="topleft"
+         name="PlayModeUISndFootsteps"
+         left_pad="1"
+         width="120" />
+
     </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index 7a8a3a77ff..13d4c40bb8 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -358,6 +358,13 @@ Przytrzymaj kursor myszki ponad polem na UUID, aby zobaczyć jego domyślną war
 			<button name="Def_UISndFriendOffline" tool_tip="Resetuj do domyślnego UUID."/>
 			<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndFriendOffline"/>
 
+			<text tool_tip="UUID dźwięku odgrywany, gdy rozlega się domyślny odgłos kroków. Zmiana wymaga restartu, aby odniosła skutek." name="textFSFootsteps">
+				Domyślny odgłos kroków:
+			</text>
+			<button name="Prev_UISndFootsteps" tool_tip="Podgląd dźwięku."/>
+			<button name="Def_UISndFootsteps" tool_tip="Resetuj do domyślnego UUID."/>
+			<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndFootsteps"/>
+
 		</panel>
 	</tab_container>
 </panel>