summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-10-22 11:47:11 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-10-22 11:47:11 +0300
commit2c7019a4d32bc78a76440da43385604b70868401 (patch)
treeaaac86905c55fb3532fab8e03a21724dd3a7472f /indra/newview
parent154e9a7c54cebee2d8cfc88261d0c8898ff57c09 (diff)
MAINT-4542 FIXED [loader mods] viewer does not display error when Material is not a subset of reference model.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 3aa191cf51..9d372766a8 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1550,7 +1550,21 @@ void LLModelPreview::rebuildUploadData()
setLoadState( LLModelLoader::ERROR_MATERIALS );
mFMP->childDisable( "calculate_btn" );
}
- }
+ else
+ {
+ if (mBaseModel.size() == mModel[i].size())
+ {
+ for (U32 idx = 0; idx < mBaseModel.size(); ++idx)
+ {
+ if (mModel[i][idx] && !mModel[i][idx]->matchMaterialOrder(mBaseModel[idx], refFaceCnt, modelFaceCnt ) )
+ {
+ setLoadState( LLModelLoader::ERROR_MATERIALS );
+ mFMP->childDisable( "calculate_btn" );
+ }
+ }
+ }
+ }
+ }
}
instance.mTransform = mat;
mUploadData.push_back(instance);