diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-12-14 22:51:18 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-12-15 03:51:36 +0200 |
| commit | 8ea1f4a3fc77145cb60a7b8182e0da9c0e43ed69 (patch) | |
| tree | 3a2640d7532d80c9118ecab86a0cb5c7396c7418 /indra/newview | |
| parent | 009cd9adccd117357fa4054c523218a0e990bb80 (diff) | |
SL-15628 Crash inside ~LLModelInstanceBase
More explicit cleanup in hopes of narrowing down which of the models
failed
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmodelpreview.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llmodelpreview.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index ccae1030f1..ad22e84c6e 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -220,6 +220,16 @@ LLModelPreview::~LLModelPreview() mPreviewAvatar->markDead(); mPreviewAvatar = NULL; } + + mUploadData.clear(); + mTextureSet.clear(); + + for (U32 i = 0; i < LLModel::NUM_LODS; i++) + { + clearModel(i); + } + mBaseModel.clear(); + mBaseScene.clear(); } void LLModelPreview::updateDimentionsAndOffsets() diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index df7320768c..d4d5d087bd 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -310,7 +310,6 @@ protected: vv_LLVolumeFace_t mBaseModelFacesCopy; U32 mGroup; - std::map<LLPointer<LLModel>, U32> mObject; // Amount of triangles in original(base) model U32 mMaxTriangleLimit; |