summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r--indra/llrender/llfontgl.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index e0c3ec3c24..beecb6b7c1 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -131,7 +131,6 @@ LLFontGL::~LLFontGL()
void LLFontGL::reset()
{
- resetBitmapCache();
if (!mIsFallback)
{
// This is the head of the list - need to rebuild ourself and all fallbacks.
@@ -150,6 +149,7 @@ void LLFontGL::reset()
}
}
}
+ resetBitmapCache();
}
// static
@@ -679,8 +679,6 @@ S32 LLFontGL::render(const LLWString &wstr,
gGL.popMatrix();
- gGL.getTexUnit(0)->disable();
-
return chars_drawn;
}