summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-17 13:56:46 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-06-17 17:19:12 +0300
commit6b251fb7a4308b7e2dbf995238866ff46ad6c780 (patch)
tree7e63bd7959ed22e39527647b8bc7e2a8f9cb0b0f /indra/llprimitive/llmodel.cpp
parent3d84a147f0ae781a71f74d9d7ad0b07f9b1ccb43 (diff)
viewer#1781 More detailed model upload errors for textures
Show filename of a specific texture
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rw-r--r--indra/llprimitive/llmodel.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 236cef9c3f..9c49f64452 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();
}