merge

1 files changed, 0 insertions, 15 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 8d5b3c648e..cc2a8c8aac 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2833,21 +2833,6 @@ void LLModelPreview::clearMaterials()
 	refresh();
 }
 
-bool LLModelPreview::containsRiggedAsset( void )
-{
-	//loop through the models and determine if any of them contained a rigged asset, and if so
-	//return true.
-	//This is used to cleanup the joint positions after a preview.
-	for (LLModelLoader::model_list::iterator iter = mBaseModel.begin(); iter != mBaseModel.end(); ++iter)
-	{
-		LLModel* pModel = *iter;
-		if ( pModel->mAlternateBindMatrix.size() > 0 )
-		{
-			return true;
-		}
-	}
-	return false;
-}
 void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_limit)
 {
 	if (mBaseModel.empty())