diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
| commit | dc6c486dea4ad16c3ed3130549ef8d04bc0c251b (patch) | |
| tree | 793505e141c1352a0b1a7dc2e8ff73407658bdaf /indra/llrender/llimagegl.cpp | |
| parent | 25d23fcbeb784e1f1312195d9ea31ad59ee81dc4 (diff) | |
| parent | 8c5da0552db39ba6031b76ffb08994e53217a559 (diff) | |
reconciled .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() |