diff options
| author | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
| commit | 6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch) | |
| tree | 1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/llrender/llimagegl.cpp | |
| parent | 71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff) | |
| parent | 8cef480b96dc779c5879f74224fb0a185ee550f2 (diff) | |
merge
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 |