diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
| commit | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (patch) | |
| tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llmodelpreview.cpp | |
| parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' 6.4.12 into DRTVWR-510
Diffstat (limited to 'indra/newview/llmodelpreview.cpp')
| -rw-r--r-- | indra/newview/llmodelpreview.cpp | 6 |
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() |