diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
| commit | 4057afd29161ad9cb69674ee608e48bc9e46a559 (patch) | |
| tree | 058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/llrender/llimagegl.cpp | |
| parent | 0f1dea30f827f920d2323d9450826f1a4baaa10b (diff) | |
| parent | 7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff) | |
merge changes for storm-1268
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 |