diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-20 15:33:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-20 15:33:57 -0500 |
| commit | 63c420d8ddb7cc738877d2771b1c3b8972a4de09 (patch) | |
| tree | 848fa13efb4b23e4661ea865a186c97fc24de021 /indra/llrender | |
| parent | e18e1375a0dc7993547b5be89fdfc47735d305e4 (diff) | |
| parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) | |
Merge
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 |