Automated merge up from viewer-development into mesh-development

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 71706f0146..58fe7e673e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -48,6 +48,7 @@
 #include "llanimationstates.h"

 #include "llavatarnamecache.h"

 #include "llavatarpropertiesprocessor.h"

+#include "llphysicsmotion.h"

 #include "llviewercontrol.h"

 #include "llcallingcard.h"		// IDEVO for LLAvatarTracker

 #include "lldrawpoolavatar.h"

@@ -111,6 +112,8 @@ extern F32 ANIM_SPEED_MIN;
 

 #include <boost/lexical_cast.hpp>

 

+// #define OUTPUT_BREAST_DATA

+

 using namespace LLVOAvatarDefines;

 

 //-----------------------------------------------------------------------------

@@ -126,6 +129,7 @@ const LLUUID ANIM_AGENT_HEAD_ROT = LLUUID("e6e8d1dd-e643-fff7-b238-c6b4b056a68d"
 const LLUUID ANIM_AGENT_PELVIS_FIX = LLUUID("0c5dd2a2-514d-8893-d44d-05beffad208b");  //"pelvis_fix"

 const LLUUID ANIM_AGENT_TARGET = LLUUID("0e4896cb-fba4-926c-f355-8720189d5b55");  //"target"

 const LLUUID ANIM_AGENT_WALK_ADJUST	= LLUUID("829bc85b-02fc-ec41-be2e-74cc6dd7215d");  //"walk_adjust"

+const LLUUID ANIM_AGENT_PHYSICS_MOTION = LLUUID("7360e029-3cb8-ebc4-863e-212df440d987");  //"physics_motion"

 

 

 //-----------------------------------------------------------------------------

@@ -623,6 +627,7 @@ BOOL LLVOAvatar::sShowAnimationDebug = FALSE;
 BOOL LLVOAvatar::sShowFootPlane = FALSE;

 BOOL LLVOAvatar::sVisibleInFirstPerson = FALSE;

 F32 LLVOAvatar::sLODFactor = 1.f;

+F32 LLVOAvatar::sPhysicsLODFactor = 1.f;

 BOOL LLVOAvatar::sUseImpostors = FALSE;

 BOOL LLVOAvatar::sJointDebug = FALSE;

 

@@ -1153,6 +1158,7 @@ void LLVOAvatar::initClass()
 

 	gAnimLibrary.animStateSetString(ANIM_AGENT_BODY_NOISE,"body_noise");

 	gAnimLibrary.animStateSetString(ANIM_AGENT_BREATHE_ROT,"breathe_rot");

+	gAnimLibrary.animStateSetString(ANIM_AGENT_PHYSICS_MOTION,"physics_motion");

 	gAnimLibrary.animStateSetString(ANIM_AGENT_EDITING,"editing");

 	gAnimLibrary.animStateSetString(ANIM_AGENT_EYE,"eye");

 	gAnimLibrary.animStateSetString(ANIM_AGENT_FLY_ADJUST,"fly_adjust");

@@ -1291,6 +1297,7 @@ void LLVOAvatar::initInstance(void)
 		// motions without a start/stop bit

 		registerMotion( ANIM_AGENT_BODY_NOISE,				LLBodyNoiseMotion::create );

 		registerMotion( ANIM_AGENT_BREATHE_ROT,				LLBreatheMotionRot::create );

+		registerMotion( ANIM_AGENT_PHYSICS_MOTION,			LLPhysicsMotionController::create );

 		registerMotion( ANIM_AGENT_EDITING,					LLEditingMotion::create	);

 		registerMotion( ANIM_AGENT_EYE,						LLEyeMotion::create	);

 		registerMotion( ANIM_AGENT_FEMALE_WALK,				LLKeyframeWalkMotion::create );

@@ -1731,6 +1738,7 @@ void LLVOAvatar::startDefaultMotions()
 	startMotion( ANIM_AGENT_EYE );

 	startMotion( ANIM_AGENT_BODY_NOISE );

 	startMotion( ANIM_AGENT_BREATHE_ROT );

+	startMotion( ANIM_AGENT_PHYSICS_MOTION );

 	startMotion( ANIM_AGENT_HAND_MOTION );

 	startMotion( ANIM_AGENT_PELVIS_FIX );

 

@@ -6484,11 +6492,9 @@ void LLVOAvatar::updateMeshTextures()
 			// When an avatar is changing clothes and not in Appearance mode,

 			// use the last-known good baked texture until it finish the first

 			// render of the new layerset.

-

 			const BOOL layerset_invalid = mBakedTextureDatas[i].mTexLayerSet 

 										  && ( !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized()

 										  || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable() );

-

 			use_lkg_baked_layer[i] = (!is_layer_baked[i] 

 									  && (mBakedTextureDatas[i].mLastTextureIndex != IMG_DEFAULT_AVATAR) 

 									  && layerset_invalid);