diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
| commit | 5fabfa50d7135d29c0cb8a553006cf9038f9baae (patch) | |
| tree | 1d0f21551bd443d4e1ba187480c082d612dfaac5 /indra/llappearance | |
| parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 7 | ||||
| -rw-r--r-- | indra/llappearance/lllocaltextureobject.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index f0df3e1474..c1336fd612 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -305,7 +305,12 @@ LLAvatarAppearance::~LLAvatarAppearance() } } - if (mRoot) mRoot->removeAllChildren(); + if (mRoot) + { + mRoot->removeAllChildren(); + delete mRoot; + mRoot = nullptr; + } mJointMap.clear(); clearSkeleton(); diff --git a/indra/llappearance/lllocaltextureobject.cpp b/indra/llappearance/lllocaltextureobject.cpp index 3f564ec3de..0481326e9e 100644 --- a/indra/llappearance/lllocaltextureobject.cpp +++ b/indra/llappearance/lllocaltextureobject.cpp @@ -76,6 +76,7 @@ LLLocalTextureObject::LLLocalTextureObject(const LLLocalTextureObject& lto) : LLLocalTextureObject::~LLLocalTextureObject() { + delete_and_clear(mTexLayers); } LLGLTexture* LLLocalTextureObject::getImage() const |