summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
commit0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch)
treec872ae80e13d12c3a282fd2af2c5005b0edb5e95 /indra/newview/llpreviewtexture.cpp
parentcbbe82b8dc08260aa4102214a7c99aeab7915371 (diff)
parent2afde26d93cc8773f5e84d187844f909347fc1bf (diff)
merge
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
-rwxr-xr-xindra/newview/llpreviewtexture.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index c8cf0faa15..2a2c51be40 100755
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -89,8 +89,12 @@ LLPreviewTexture::~LLPreviewTexture()
{
getWindow()->decBusyCount();
}
- mImage->setBoostLevel(mImageOldBoostLevel);
- mImage = NULL;
+
+ if (mImage.notNull())
+ {
+ mImage->setBoostLevel(mImageOldBoostLevel);
+ mImage = NULL;
+ }
}
// virtual