summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
commit60c4621500e478d66a8bdc3a1c80573be2860fee (patch)
treefa10b52caf3a54e03502058cd52d77952370cb34 /indra/llrender
parent2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff)
parentba414d500ca8cb88da530c89ba373c95195ce633 (diff)
Automated merge from viewer/viewer-2-0
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;
}
}
}