diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7e5a991c7..0ccac5736 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9,6 +9,17 @@
 		<string>settings_rlv.xml</string>
 	</array>
 
+	<key>SGIgnoreSimulatorCameraConstraints</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Don't let the simulator push your camera around</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>Boolean</string>
+	  <key>Value</key>
+	  <integer>0</integer>
+	</map>
 	<key>SGAllowRiggedMeshSelection</key>
 	<map>
 	  <key>Comment</key>
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 08c35ec43..93390e1e5 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1844,7 +1844,10 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 				local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
 			}
 
-			if (!mCameraCollidePlane.isExactlyZero() && (!isAgentAvatarValid() || !gAgentAvatarp->isSitting()))
+			if ( !mCameraCollidePlane.isExactlyZero()
+				 && !gSavedSettings.getBOOL("SGIgnoreSimulatorCameraConstraints")
+				 && isAgentAvatarValid()
+				 && !gAgentAvatarp->isSitting())
 			{
 				LLVector3 plane_normal;
 				plane_normal.setVec(mCameraCollidePlane.mV);