diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2025-07-25 01:44:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 01:44:36 +0300 |
| commit | 5c746ae372a0f4ab249377091bc7cdca4ca474f7 (patch) | |
| tree | bad2789fbdcbbee4723ac85e0c7f2da62ebab357 | |
| parent | e05b32a0305f57573236c12dc4c1fbeecf2878ed (diff) | |
#4415 fix crash when cancelling large model process on MacOS
| -rw-r--r-- | indra/newview/llmodelpreview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index e819f4dec0..d68fc9c02d 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -3084,9 +3084,12 @@ void LLModelPreview::loadedCallback( S32 lod, void* opaque) { + if(LLModelPreview::sIgnoreLoadedCallback) + return; + LLModelPreview* pPreview = static_cast<LLModelPreview*>(opaque); LLMutexLock lock(pPreview); - if (pPreview && pPreview->mModelLoader && !LLModelPreview::sIgnoreLoadedCallback) + if (pPreview && pPreview->mModelLoader) { // Load loader's warnings into floater's log tab const LLSD out = pPreview->mModelLoader->logOut(); |