diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 67995db1be3dcec0da95f81cb5adc714164cf6be..891fc6b49658b8af9ce59ec06de80f3141f11c3e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17935,5 +17935,16 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ClickingAvatarKeepsCamera</key>
+  <map>
+    <key>Comment</key>
+    <string>This option allows you to orbit your camera without your avatar rotating when clicking on it or your nametag.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
 </map>
 </llsd>
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 685066506be8c3f681a9c2c433bd1399c0570fe1..8dba8c6630b5b16ad1a90668f19a5a6009f5dafc 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -498,7 +498,9 @@ BOOL LLToolPie::handleLeftClickPick()
 		LLToolCamera::getInstance()->setMouseCapture(TRUE);
         LLToolCamera::getInstance()->setClickPickPending();
 		LLToolCamera::getInstance()->pickCallback(mPick);
-		gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+        if(!gSavedSettings.getBool("ClickingAvatarKeepsCamera")){
+            gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+		}
 
 		return TRUE;
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_move_general.xml
index 3d775e3a42dfff95620f7c285c5092d8d0021f0c..e1f60e1a9fff58971cac808d1f8e1253a7bd3531 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move_general.xml
@@ -55,6 +55,18 @@
    show_text="false"
    width="240"
    top_pad="5"/>
+    <check_box
+      control_name="ClickingAvatarKeepsCamera"
+      follows="left|top"
+      height="25"
+      label="Clicking on your avatar does not rotate it."
+      tool_tip="This option allows you to orbit your camera without your avatar rotating when clicking on it or your nametag."
+      layout="topleft"
+      left_delta="0"
+      name="clicking_avatar_keeps_camera"
+      width="237"
+      top_pad="0"
+    />
   <text
   follows="left|top"
   type="string"