summaryrefslogtreecommitdiff
path: root/indra/newview/llmodelpreview.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 22:16:04 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 22:16:04 +0200
commit74c3b7a0ee70f639dc5dcfd08f7f0762758183ee (patch)
treedffe098f8ff7443eaa20a215c980a395252dc190 /indra/newview/llmodelpreview.cpp
parent3f51c0423942f61d27c33bfdb1622e5ae2b8c9ae (diff)
parent04c473ab46041133ea6a87dbe0d43e662472adf5 (diff)
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
Diffstat (limited to 'indra/newview/llmodelpreview.cpp')
-rw-r--r--indra/newview/llmodelpreview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index d60d1d748e..a9e80ab5da 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -245,6 +245,12 @@ LLModelPreview::~LLModelPreview()
{
mModelLoader->shutdown();
}
+
+ if (mPreviewAvatar)
+ {
+ mPreviewAvatar->markDead();
+ mPreviewAvatar = NULL;
+ }
}
U32 LLModelPreview::calcResourceCost()