diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-03-09 10:19:47 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-03-09 10:19:47 -0700 |
| commit | 6f5877e3e549fd42d0a973ccb19ade6a1ee2c392 (patch) | |
| tree | e23b43adb942deef8bf4d42fa37550063c4d6981 | |
| parent | caa1435ae0afa0e4ac2fe42fc8dc67dd93cdb524 (diff) | |
| parent | 0a7fbb31d45d356b50899534ff6740097d5d3f22 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -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; } |