#4415 fix crash when cancelling large model process on MacOS

maxim-productengine · web-flow · commit 5c746ae372a0 · 2025-07-25T01:44:36.000+03:00
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -3084,9 +3084,12 @@ void LLModelPreview::loadedCallback(`
`3084`	`3084`	`S32 lod,`
`3085`	`3085`	`void* opaque)`
`3086`	`3086`	`{`
	`3087`	`+ if(LLModelPreview::sIgnoreLoadedCallback)`
	`3088`	`+ return;`
	`3089`	`+`
`3087`	`3090`	`LLModelPreview* pPreview = static_cast<LLModelPreview*>(opaque);`
`3088`	`3091`	`LLMutexLock lock(pPreview);`
`3089`		`- if (pPreview && pPreview->mModelLoader && !LLModelPreview::sIgnoreLoadedCallback)`
	`3092`	`+ if (pPreview && pPreview->mModelLoader)`
`3090`	`3093`	`{`
`3091`	`3094`	`// Load loader's warnings into floater's log tab`
`3092`	`3095`	`const LLSD out = pPreview->mModelLoader->logOut();`