2 files changed, 15 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 19ad234..b883231 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -157,6 +157,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>IgnoreSimulatorCameraConstraints</key>
+  <map>
+    <key>Comment</key>
+    <string>Ignores the 'push' the simulator applies to your camera to keep it out of objects.(Requires restart to work correctly)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>LastGrass</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index c6f93ee..1e185e6 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -4324,6 +4324,10 @@ void process_avatar_appearance(LLMessageSystem *mesgsys, void **user_data)
 
 void process_camera_constraint(LLMessageSystem *mesgsys, void **user_data)
 {
+        if(gSavedSettings.getBOOL("IgnoreSimulatorCameraConstraints"))
+        {
+                return;
+        }
         LLVector4 cameraCollidePlane;
         mesgsys->getVector4Fast(_PREHASH_CameraCollidePlane, _PREHASH_Plane, cameraCollidePlane);