diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-11-29 00:16:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 00:16:20 +0200 |
| commit | 5ac2adfa280ad589de7530c6d72db09c7788b27f (patch) | |
| tree | aba16e60163c8448ac4225a2ed131c3a223dca83 /indra/newview/llmodelpreview.h | |
| parent | 1b4814f0e5784b3c339328cccde070dc7c20606b (diff) | |
#3133 add handler to prevent crash when preview gets closed before getting the callback
Diffstat (limited to 'indra/newview/llmodelpreview.h')
| -rw-r--r-- | indra/newview/llmodelpreview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index e236d7ced7..0873263587 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -111,7 +111,7 @@ static const std::string lod_label_name[NUM_LOD + 1] = "I went off the end of the lod_label_name array. Me so smart." }; -class LLModelPreview : public LLViewerDynamicTexture, public LLMutex +class LLModelPreview : public LLViewerDynamicTexture, public LLMutex, public LLHandleProvider<LLModelPreview> { LOG_CLASS(LLModelPreview); @@ -211,7 +211,7 @@ protected: static void stateChangedCallback(U32 state, void* opaque); static LLJoint* lookupJointByName(const std::string&, void* opaque); - static U32 loadTextures(LLImportMaterial& material, void* opaque); + static U32 loadTextures(LLImportMaterial& material, LLHandle<LLModelPreview> handle); void lookupLODModelFiles(S32 lod); |