diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-09 14:46:07 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-09 14:46:07 -0500 |
commit | f49203a3830cfab59b07cbfd87f5cbd07e75c579 (patch) | |
tree | 395d022c539cb9e66bd54d5481eb3fbb5666687a /indra/newview | |
parent | f1a58bd14ec774047c0cc5b9b65883cc6d03405a (diff) | |
parent | ddbc10d03cd33315618f811a8958b27893ffe5ab (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 01d437f9eb..b21758d3b3 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1417,9 +1417,8 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/) if (!mForceToSaveRawImage) { mNeedsAux = FALSE; - } destroyRawImage(); - + } return res; } |