summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-04-30 19:10:55 -0700
committerMerov Linden <merov@lindenlab.com>2012-04-30 19:10:55 -0700
commitc0855030de1e0811b3db8b8d98d089956fda24c8 (patch)
tree848f4d3fae57dc13f52cd312893755c6b2528e3c /indra
parent3f31c82a1c7a9419891ff2c7b81324e99414395e (diff)
Fix sculpties being deleted while being still in use in the scene
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewertexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index a889cd9637..90ba21ef34 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1147,7 +1147,7 @@ S32 LLViewerTexture::getDiscardLevelInAtlas() const
void LLViewerTexture::destroyGLTexture()
{
- if(mGLTexturep.notNull())
+ if(mGLTexturep.notNull() && mGLTexturep->getHasGLTexture())
{
mGLTexturep->destroyGLTexture() ;
mTextureState = DELETED ;