diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-02 21:22:50 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-02 21:22:50 +0200 |
| commit | e9370893f7f6b3473059c63c42089b42593d6a4d (patch) | |
| tree | b5c9b3d6a7c1c966825257a892c37afa787210d8 /indra/llprimitive/llmodelloader.cpp | |
| parent | 11b9b6f5f826c26673b79360c79daae7061c9569 (diff) | |
| parent | a6615b3264011f186678e7d0380291dd3bedc9aa (diff) | |
Merge branch 'contribute' into DRTVWR-577-maint-S
Diffstat (limited to 'indra/llprimitive/llmodelloader.cpp')
| -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 |