diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
| commit | 6a15da0133aac12f3223d91078d133d50e7d44ee (patch) | |
| tree | fadafea4c31ed6c56560cd2126214486a231ab6d /indra/llrender/llimagegl.cpp | |
| parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff) | |
| parent | 723d05e6df1d89b8957aca429b1328834f323150 (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() |