diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
commit | 8379df21bce877897aec6c56f170b6e2ad11c7be (patch) | |
tree | 908e3940d8c9624b1b0591567a35b2314ed6277c /indra/llrender/llimagegl.cpp | |
parent | 6c61a537918b5cc73336885f8bdd34943fda2482 (diff) | |
parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) |
merged .hgtags
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() |