diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
| commit | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (patch) | |
| tree | 51da53114f257ca57c2aa36da655019b75cf0269 /indra/llrender/llimagegl.cpp | |
| parent | c64bd7d5cb28fc221716e866ff9c9a28c22e69ce (diff) | |
| parent | fef401a1768bae9bfb23a13549fa3a5005f2c7ae (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 9ca3a23d52..7188b0fa44 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1424,7 +1424,7 @@ void LLImageGL::deleteDeadTextures() { LLTexUnit* tex_unit = gGL.getTexUnit(i); - if (tex_unit->getCurrTexture() == tex) + if (tex_unit && tex_unit->getCurrTexture() == tex) { tex_unit->unbind(tex_unit->getCurrType()); stop_glerror(); @@ -1887,6 +1887,7 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) void LLImageGL::setCategory(S32 category) { +#if 0 //turn this off temporarily because it is not in use now. if(!gAuditTexture) { return ; @@ -1907,6 +1908,7 @@ void LLImageGL::setCategory(S32 category) mCategory = -1 ; } } +#endif } //for debug use |