diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:59:39 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:59:39 +0800 |
| commit | 50755dcf5f6d4c70c6b6815b2467dda61dc4dc5a (patch) | |
| tree | 4db99c2b48408390dfffe6b39261311002c5e3ec /indra/newview/llviewermenufile.cpp | |
| parent | 6daacd94d1f53e53417ac24f05b983a2600a964f (diff) | |
| parent | f5d350fb7bd51735ab2624262e841d614c6eadd8 (diff) | |
Merge tag 'Second_Life_Release#f5d350fb-2025.05-gltf-mesh-import' into 2025.05
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 9743ec0c59..84195997c3 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -94,7 +94,7 @@ class LLFileEnableUploadModel : public view_listener_t bool handleEvent(const LLSD& userdata) { LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) LLFloaterReg::findInstance("upload_model"); - if (fmp && fmp->isModelLoading()) + if (fmp && !fmp->isDead() && fmp->isModelLoading()) { return false; } |