diff options
| author | prep linden <prep@lindenlab.com> | 2011-08-30 10:46:41 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-08-30 10:46:41 -0400 |
| commit | 2df669c402b5344397499186e73d0886dd5da4d1 (patch) | |
| tree | 4628b7d608be7a0a2061bdaebb250df5813e554c | |
| parent | 6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (diff) | |
Log error message if material list is not a subset of reference model
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index d13e6b662c..6e4bb7ec97 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1959,6 +1959,7 @@ bool LLModel::matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCn bool isASubset = isMaterialListSubset( ref ); if ( !isASubset ) { + llinfos<<"Material of model is not a subset of reference."<<llendl; return false; } diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 7c6896becf..259d2e70b6 100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -21,6 +21,7 @@ <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string> <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string> <string name="mesh_status_missing_lod">Missing required level of detail.</string> + <string name="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</string> <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" --> <string name="decomposing">Analyzing...</string> <string name="simplifying">Simplifying...</string> |