diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-16 15:39:25 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-16 15:39:25 -0800 |
| commit | 39efc3de51443bf8a0e6167e9f92833f8480968e (patch) | |
| tree | a1e17d4e269ef02a28f8c09dd224c3829e0c76ee /indra/newview/llviewertexture.cpp | |
| parent | e4453f9cc8479a4ac3344e68210004dbc39b17db (diff) | |
| parent | b62a8c14edb3f30cb39c67d3ad982a809c9ce5e8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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) |