Remove duplicated code in llfloatermodelpreview.cpp

Tue, 05 Apr 2016 18:15:08 +0200

author
Ansariel
date
Tue, 05 Apr 2016 18:15:08 +0200
changeset 48938
2c54d70b8709
parent 48937
c2a72124afbb
child 48939
a3cdd242aeb5

Remove duplicated code in llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llfloatermodelpreview.cpp	Sun Apr 03 19:02:40 2016 +0200
     1.2 +++ b/indra/newview/llfloatermodelpreview.cpp	Tue Apr 05 18:15:08 2016 +0200
     1.3 @@ -1685,34 +1685,6 @@
     1.4  		}
     1.5  	}
     1.6  
     1.7 -	for (U32 lod = 0; lod < LLModel::NUM_LODS-1; lod++)
     1.8 -	{
     1.9 -		// Search for models that are not included into upload data
    1.10 -		// If we found any, that means something we loaded is not a sub-model.
    1.11 -		for (U32 model_ind = 0; model_ind < mModel[lod].size(); ++model_ind)
    1.12 -		{
    1.13 -			bool found_model = false;
    1.14 -			for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
    1.15 -			{
    1.16 -				LLModelInstance& instance = *iter;
    1.17 -				if (instance.mLOD[lod] == mModel[lod][model_ind])
    1.18 -				{
    1.19 -					found_model = true;
    1.20 -					break;
    1.21 -				}
    1.22 -			}
    1.23 -			if (!found_model && mModel[lod][model_ind] && !mModel[lod][model_ind]->mSubmodelID)
    1.24 -			{
    1.25 -				if (importerDebug)
    1.26 -				{
    1.27 -					LL_INFOS() << "Model " << mModel[lod][model_ind]->mLabel << " was not used - mismatching lod models." <<  LL_ENDL;
    1.28 -				}
    1.29 -				setLoadState( LLModelLoader::ERROR_MATERIALS );
    1.30 -				mFMP->childDisable( "calculate_btn" );
    1.31 -			}
    1.32 -		}
    1.33 -	}
    1.34 -
    1.35  	// <FS:AW> OpenSim limits
    1.36  	//F32 max_import_scale = (DEFAULT_MAX_PRIM_SCALE-0.1f)/max_scale;
    1.37  	F32 region_max_prim_scale = LLWorld::getInstance()->getRegionMaxPrimScale();

mercurial