diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-28 02:01:49 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-28 02:02:42 +0200 |
| commit | 21b592865228bacf07ec8a526f1756bae69597e0 (patch) | |
| tree | c1dd1b28a5e67c12e224dc663ed8c678c26a89c3 | |
| parent | 27080dc7f7f9a733706e0d9120b8ed805e8170c8 (diff) | |
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 closes
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 5171621007..3dd1652154 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -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 |