livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4915 FIXED [loader mods] Incorrect error description in case of VERTEX_NUMBER_OVERFLOW

master
andreykproductengine 2015-02-23 15:04:32 +02:00
parent b25dfc8cfd
commit 6993f835e7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llprimitive/lldaeloader.cpp
View File

@ -928,7 +928,7 @@ bool LLDAELoader::OpenFile(const std::string& filename)
LLModel* mdl = *i;
if(mdl->getStatus() != LLModel::NO_ERRORS)
{
setLoadState(ERROR_PARSING + mdl->getStatus()) ;
setLoadState(ERROR_MODEL + mdl->getStatus()) ;
return false; //abort
}

3
indra/llprimitive/llmodelloader.h
View File

@ -89,7 +89,8 @@ public:
ERROR_LOADER_SETUP,
ERROR_INVALID_PARAMETERS,
ERROR_OUT_OF_RANGE,
ERROR_FILE_VERSION_INVALID
ERROR_FILE_VERSION_INVALID,
ERROR_MODEL // this error should always be last in this list, error code is passed as ERROR_MODEL+error_code
} eLoadState;
U32 mState;

6
indra/newview/llfloatermodelpreview.cpp
View File

@ -634,9 +634,9 @@ void LLFloaterModelPreview::draw()
childSetTextArg("status", "[STATUS]", getString("status_material_mismatch"));
}
else
if ( mModelPreview->getLoadState() > LLModelLoader::ERROR_PARSING )
{
childSetTextArg("status", "[STATUS]", getString(LLModel::getStatusString(mModelPreview->getLoadState() - LLModelLoader::ERROR_PARSING)));
if ( mModelPreview->getLoadState() > LLModelLoader::ERROR_MODEL )
{
childSetTextArg("status", "[STATUS]", getString(LLModel::getStatusString(mModelPreview->getLoadState() - LLModelLoader::ERROR_MODEL)));
}
else
if ( mModelPreview->getLoadState() == LLModelLoader::ERROR_PARSING )