SL-19097 Crash when selecting a model for upload and waiting too long
Should be fixed by SL-18996, but just in case user decides to select a model while viewer closesmeow-7.2.2
parent
27080dc7f7
commit
21b5928652
|
|
@ -25,6 +25,8 @@
|
|||
*/
|
||||
|
||||
#include "llmodelloader.h"
|
||||
|
||||
#include "llapp.h"
|
||||
#include "llsdserialize.h"
|
||||
#include "lljoint.h"
|
||||
#include "llcallbacklist.h"
|
||||
|
|
@ -363,7 +365,10 @@ bool LLModelLoader::isAlive(LLModelLoader* loader)
|
|||
|
||||
void LLModelLoader::loadModelCallback()
|
||||
{
|
||||
mLoadCallback(mScene,mModelList,mLod, mOpaqueData);
|
||||
if (!LLApp::isExiting())
|
||||
{
|
||||
mLoadCallback(mScene, mModelList, mLod, mOpaqueData);
|
||||
}
|
||||
|
||||
while (!isStopped())
|
||||
{ //wait until this thread is stopped before deleting self
|
||||
|
|
|
|||
Loading…
Reference in New Issue