diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-16 15:37:52 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-16 15:37:52 -0800 |
| commit | b62a8c14edb3f30cb39c67d3ad982a809c9ce5e8 (patch) | |
| tree | 064c1be713b0c9804c08e224afd6c2648537cb29 /indra/newview/llviewertexture.cpp | |
| parent | be666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (diff) | |
fix for DEV-2530: crash after teleporting to refion.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 85bc26c9c0..0d29efaedf 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2121,10 +2121,11 @@ LLImageRaw* LLViewerFetchedTexture::reloadRawImage(S8 discard_level) llassert_always(mGLTexturep.notNull()) ; llassert_always(discard_level >= 0); llassert_always(mComponents > 0); + if (mRawImage.notNull()) { - llerrs << "called with existing mRawImage" << llendl; - mRawImage = NULL; + //mRawImage is in use by somebody else, do not delete it. + return NULL ; } if(mSavedRawDiscardLevel >= 0 && mSavedRawDiscardLevel <= discard_level) |