summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-03-21 18:36:50 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-03-21 18:36:50 +0200
commit5bbf263c293286395730d969e0b9beec9d830f48 (patch)
tree22b81dea68f728ec122de561cb8d77fe4fb14d94 /indra/newview/llpreviewtexture.cpp
parent824deea265614b649e074d4702e8f4bf071cef68 (diff)
parent4aae7b51616c0963af4668442bdb5bfaba8c5044 (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