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

MAINT-6160 Fix for ImporterLegacyMatching crash

meow-7.2.2
andreykproductengine 2016-02-23 18:30:29 +02:00
parent 35b499a0be
commit 2d41b4fe30
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloatermodelpreview.cpp
View File

@ -1550,9 +1550,18 @@ void LLModelPreview::rebuildUploadData()
}
instance.mLOD[i] = lod_model;
}
else if (importerDebug)
else
{
LL_INFOS() << "List of models does not include " << instance.mLabel << LL_ENDL;
if (i < LLModel::LOD_HIGH && !lodsReady())
{
// assign a placeholder from previous LOD until lod generation is complete.
// Note: we might need to assign it regardless of conditions like named search does, to prevent crashes.
instance.mLOD[i] = instance.mLOD[i + 1];
}
if (importerDebug)
{
LL_INFOS() << "List of models does not include " << instance.mLabel << LL_ENDL;
}
}
}