diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
| commit | b8be8820ea52a77df6362179b1dda3fc4a305913 (patch) | |
| tree | 061d59de4c1ccca88aa82ec7381790581f90bee9 /indra/llrender/llimagegl.cpp | |
| parent | e0728065251fbd5f45218eb94c056a92162eb54d (diff) | |
| parent | a5769e81263d6d004033b914c1cbf1a8296923d9 (diff) | |
close head created by 54e071a92450
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 60a5962234..9ca3a23d52 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1414,6 +1414,8 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre void LLImageGL::deleteDeadTextures() { + bool reset = false; + while (!sDeadTextureList.empty()) { GLuint tex = sDeadTextureList.front(); @@ -1426,12 +1428,22 @@ void LLImageGL::deleteDeadTextures() { tex_unit->unbind(tex_unit->getCurrType()); stop_glerror(); + + if (i > 0) + { + reset = true; + } } } glDeleteTextures(1, &tex); stop_glerror(); } + + if (reset) + { + gGL.getTexUnit(0)->activate(); + } } void LLImageGL::destroyGLTexture() |