diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
| commit | 66cac05cfb1236c3c1607dff27babf873c29a679 (patch) | |
| tree | 64a5eee7cf984098a5614563a9f5ad49b520fa17 /indra/llrender | |
| parent | bf906ac9264e21d622e4ce867c40dd53a0da6013 (diff) | |
| parent | 2434a39c252ce895e7c659f42c54b9142ad859c2 (diff) | |
merge changes for storm-1570
Diffstat (limited to 'indra/llrender')
| -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 |