Skip to content

#4415 fix crash when cancelling large model process on MacOS #4433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025
Merged

#4415 fix crash when cancelling large model process on MacOS #4433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion indra/newview/llmodelpreview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading