From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 23 Aug 2010 16:13:10 -0400
Subject: Created new wearable type. Added debug setting for disabling physics.
 Added disable-multiwear and disable-camera-reset to wearabletype.

---
 indra/newview/llvoavatar.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llvoavatar.cpp')

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0f5df8ce12..80b10cc05e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -103,7 +103,7 @@ extern F32 ANIM_SPEED_MIN;
 
 #include <boost/lexical_cast.hpp>
 
-#define OUTPUT_BREAST_DATA
+// #define OUTPUT_BREAST_DATA
 
 using namespace LLVOAvatarDefines;
 
@@ -787,6 +787,11 @@ public:
 	// must return FALSE when the motion is completed.
 	virtual BOOL onUpdate(F32 time, U8* joint_mask)
 	{
+		if (!gSavedSettings.getBOOL("AvatarPhysics"))
+		{
+			return FALSE;
+		}
+
 		/*
 		FILE *fread = fopen("c:\\temp\\breast_data.txt","r");
 		if (fread)
-- 
cgit v1.3