summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontfreetype.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
commit9c29000ba2f8192985ad0bf20889739ad12dd569 (patch)
tree3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llrender/llfontfreetype.cpp
parent71e237a3f79cd90b432205460fe6e5c6b536d9db (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge. Refresh from viewer-release after 3.7.3 release.
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
-rwxr-xr-xindra/llrender/llfontfreetype.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 058bef43a5..84c782e958 100755
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -125,6 +125,7 @@ LLFontFreetype::~LLFontFreetype()
// Delete glyph info
std::for_each(mCharGlyphInfoMap.begin(), mCharGlyphInfoMap.end(), DeletePairedPointer());
+ mCharGlyphInfoMap.clear();
// mFontBitmapCachep will be cleaned up by LLPointer destructor.
// mFallbackFonts cleaned up by LLPointer destructor