diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-04-27 18:32:42 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-04-27 18:32:42 -0600 |
| commit | 164de6c1807a5517cbd2ccf7d16b536aa333e64a (patch) | |
| tree | f9a3d54df6e9600e1a49513b488aac9adabe3dc2 /indra | |
| parent | 3a9aa29a44f8b20ff9aa5c5eeaf7efccc81ae608 (diff) | |
fix for a crash on sculpt
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index ab744fb7ff..bd9953e418 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1464,10 +1464,10 @@ void LLImageGL::destroyGLTexture() } LLImageGL::deleteTextures(1, &mTexName); - mTexName = 0; - mCurrentDiscardLevel = -1 ; //invalidate mCurrentDiscardLevel. + mTexName = 0; mGLTextureCreated = FALSE ; } + mCurrentDiscardLevel = -1 ; //invalidate mCurrentDiscardLevel. } diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 1b468a7b96..f27e20c2a2 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1146,7 +1146,7 @@ S32 LLViewerTexture::getDiscardLevelInAtlas() const void LLViewerTexture::destroyGLTexture() { - if(mGLTexturep.notNull() && mGLTexturep->getHasGLTexture()) + if(mGLTexturep.notNull()) { mGLTexturep->destroyGLTexture() ; mTextureState = DELETED ; |