diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-14 11:17:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-14 11:17:35 +0300 |
| commit | 6f072c2121fcb6f00ccc773d0ff4edc5cbfb013b (patch) | |
| tree | 62c4967d6be428907691f133e794654b25c5d140 /indra/llprimitive/llmodel.cpp | |
| parent | 8145d99f80d55c4da88adb6909386bd5c25fd743 (diff) | |
| parent | d859557c1865b0636ce2a407d2e7b814fbfc1eb6 (diff) | |
Merge 2025.06 into develop
Merge 2025.06 into develop
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index a33f25307e..00ef79ce7f 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -66,7 +66,12 @@ LLModel::~LLModel() { if (mDecompID >= 0) { - LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID); + // can be null on shutdown + LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); + if (decomp) + { + decomp->deleteDecomposition(mDecompID); + } } mPhysics.mMesh.clear(); } |