diff options
Diffstat (limited to 'indra/llrender/llfontbitmapcache.cpp')
| -rw-r--r-- | indra/llrender/llfontbitmapcache.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp index 2d65ec47c6..8809f9f475 100644 --- a/indra/llrender/llfontbitmapcache.cpp +++ b/indra/llrender/llfontbitmapcache.cpp @@ -30,7 +30,7 @@ #include "llfontbitmapcache.h" LLFontBitmapCache::LLFontBitmapCache() - : LLTrace::MemTrackable<LLFontBitmapCache>("LLFontBitmapCache") + { } @@ -113,9 +113,6 @@ BOOL LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyp // Attach corresponding GL texture. (*TODO: is this needed?) gGL.getTexUnit(0)->bind(image_gl); image_gl->setFilteringOption(LLTexUnit::TFO_POINT); // was setMipFilterNearest(TRUE, TRUE); - - claimMem(image_raw); - claimMem(image_gl); } else { @@ -147,21 +144,9 @@ void LLFontBitmapCache::destroyGL() void LLFontBitmapCache::reset() { - for (U32 kitty = 0, cnt = static_cast<U32>(EFontGlyphType::Count); kitty < cnt; kitty++) - { - for (LLImageRaw* image_raw : mImageRawVec[kitty]) - { - disclaimMem(image_raw); - } - mImageRawVec[kitty].clear(); - } - for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++) { - for (LLImageGL* image_gl : mImageGLVec[idx]) - { - disclaimMem(image_gl); - } + mImageRawVec[idx].clear(); mImageGLVec[idx].clear(); mCurrentOffsetX[idx] = 1; mCurrentOffsetY[idx] = 1; |