diff options
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 17 | 
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 0a1eadf4d0..f06c5dcd64 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3374,6 +3374,12 @@ void LLPhysicsDecomp::doDecomposition()  	LLCDMeshData mesh;  	S32 stage = mStageID[mCurRequest->mStage]; +	if (LLConvexDecomposition::getInstance() == NULL) +	{ +		// stub library. do nothing. +		return; +	} +  	//load data intoLLCD  	if (stage == 0)  	{ @@ -3574,6 +3580,12 @@ void LLPhysicsDecomp::doDecompositionSingleHull()  	LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); +	if (decomp == NULL) +	{ +		//stub. do nothing. +		return; +	} +  	for (S32 i = 0; i < param_count; ++i)  	{  		decomp->setParam(params[i].mName, params[i].mDefault.mIntOrEnumValue); @@ -3653,6 +3665,11 @@ void LLPhysicsDecomp::doDecompositionSingleHull()  void LLPhysicsDecomp::run()  {  	LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); +	if (decomp == NULL) +	{ +		return; +	} +  	decomp->initThread();  	mInited = true;  | 
