diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 768f5eadec..94eee97dcc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21983,6 +21983,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <string/>
     </map>
+    <key>FSTurnAvatarToSelectedObject</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, the avatar turns towards an selected object</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
 </map>
 </llsd>
 
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index dffced578c..c813ac62cc 100755
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -200,7 +200,11 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
 
 		if (!gAgentCamera.getFocusOnAvatar() &&										// if camera not glued to avatar
 			LLVOAvatar::findAvatarFromAttachment(object) != gAgentAvatarp &&	// and it's not one of your attachments
-			object != gAgentAvatarp)									// and it's not you
+			// <FS:Ansariel> FIRE-8039: Prevent avatar from turning to selected object
+			//object != gAgentAvatarp)									// and it's not you
+			object != gAgentAvatarp &&									// and it's not you
+			gSavedSettings.getBOOL("FSTurnAvatarToSelectedObject"))
+			// </FS:Ansariel>
 		{
 			// have avatar turn to face the selected object(s)
 			LLVector3d selection_center = LLSelectMgr::getInstance()->getSelectionCenterGlobal();
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
index 394b6736a8..5c3b68abd1 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
@@ -99,6 +99,7 @@
 			<check_box label="Info anzeigen, wenn sich der Simulator-Kanal beim Regionswechsel ändert" name="FSShowServerVersionChangeNotice" tool_tip="Zeigt an, falls sich beim einem Wechsel der Region oder durch einen Teleport die Version des Simulators ändert, auf dem die Region läuft."/>
 			<check_box label="Simulator-Kanal in der Statusleiste anzeigen" name="FSStatusbarShowSimulatorVersion" tool_tip="Zeigt den Kanal des Simulators an, auf dem die aktuelle Region läuft."/>
 			<check_box label="Avatar umdrehen beim Rückwärtsgehen" name="backwardsturnavatar" tool_tip="Dreht den Avatar mit dem Gesicht zur Kamera beim Rückwärtsgehen."/>
+			<check_box label="Avatar zum ausgewählten Objekt drehen" name="FSTurnAvatarToSelectedObject" tool_tip="Dreht den Avatar mit dem Gesicht zum aktuell ausgewählten Objekt."/>
 		</panel>
 	</tab_container>
 </panel>
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 92f4621196..fd059a0e73 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -522,7 +522,7 @@
      label="Firestorm"
      name="tab-firestorm" >
         <text
-         top_pad="10"
+         top_pad="5"
          type="string"
          length="1"
          follows="left|top"
@@ -634,7 +634,7 @@
          control_name="FSAlwaysOpaqueCameraControls"/>
 
         <text
-         top_pad="6"
+         top_pad="4"
          type="string"
          length="1"
          follows="left|top"
@@ -714,7 +714,7 @@
          top_pad="5"/>
 
         <text
-         top_pad="6"
+         top_pad="4"
          type="string"
          length="1"
          follows="left|top"
@@ -787,6 +787,14 @@
          control_name="TurnAroundWhenWalkingBackwards"
          tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
         
+        <check_box top_pad="5"
+         follows="left|top"
+         height="16"
+         label="Turn avatar towards a selected object"
+         name="FSTurnAvatarToSelectedObject"
+         width="270"
+         control_name="FSTurnAvatarToSelectedObject"
+         tool_tip="Turns your avatar around to face the object you are currently selecting."/>
 	 </panel>
 </tab_container>
 </panel>