diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
| commit | 5a39c44b56191a4ba516d3c504b3a0a574156e72 (patch) | |
| tree | e95e5fc6cde0a046ac88abeba4a3410123cae890 /indra/llrender/llimagegl.cpp | |
| parent | f5a890453b0a98636e6267b3272567ae0eecf1e4 (diff) | |
| parent | 68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee (diff) | |
merged .hgtags
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 |