diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-16 18:19:43 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-16 18:19:43 -0800 |
| commit | d3b03c7f53388a4a43cbce7c5ab196ab469d4abd (patch) | |
| tree | 1199b9a925e21a2a8d82dcb2cf4ee91927d82f0b /indra/newview/llviewertexture.cpp | |
| parent | 6e7d131e5800d921ec9bcf7b51f619256367fa55 (diff) | |
| parent | 27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff) | |
Merge with viewer-2-0 changes
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) |