3 files changed, 34 insertions, 8 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 00c30c1..44c6b9a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -135,6 +135,17 @@
       <real>1</real>
     </array>
   </map>
+  <key>HeadFollowsMouse</key>
+  <map>
+    <key>Comment</key>
+    <string>IF your avatars head follows your mouse movements (then the extend is defined in YawFromMousePosition  and PitchFromMousePosition</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>HighlightOwnNameInChat</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 871c90d..922db37 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -2734,14 +2734,24 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                 }
                 else if (cameraThirdPerson())
                 {
-                        // range from -.5 to .5
-                        F32 x_from_center = 
-                                ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
-                        F32 y_from_center = 
-                                ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
-
-                        frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition") * DEG_TO_RAD);
-                        frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition") * DEG_TO_RAD);
+                        if (gSavedSettings.getBOOL("HeadFollowsMouse"))
+                        {
+                                // range from -.5 to .5
+                                F32 x_from_center = 
+                                        ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
+                                F32 y_from_center = 
+                                        ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
+
+                                frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition")
+                                                        * DEG_TO_RAD);
+                                frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition")
+                                                        * DEG_TO_RAD);
+                        }
+                        else
+                        {
+                                frameCamera.yaw( 0.f );
+                                frameCamera.pitch( 0.f );
+                        }
                         lookAtType = LOOKAT_TARGET_FREELOOK;
                 }
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index b8f6e7d..9817756 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -77,6 +77,11 @@
            tool_tip="Toggle editing animation and standing up when entering appearance mode" 
            label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" control_name="HeadFollowsMouse" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" 
+           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left="12"
+           mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
+           width="256" />
       <check_box bottom_delta="-25" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
            label="Use legacy pie menus" left="12"