summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
commit3874823bd8a388979bad2d882d5d52bffb8d78da (patch)
treecb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/llrender
parent2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff)
parenta872814de964ebcbf40e812f79319a13a54e2336 (diff)
Merge from viewer-2-0
--HG-- branch : product-engine
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llfontregistry.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 7a3d6ec4f2..e619f89e1d 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -469,6 +469,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
else
{
fontlist.push_back(fontp->mFontFreetype);
+ delete fontp;
+ fontp = NULL;
}
}
}