summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-16 10:19:37 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-16 10:19:37 -0400
commitba414d500ca8cb88da530c89ba373c95195ce633 (patch)
tree7101caf69a2d609d04f1352ad2f01c8d310e6228 /indra/llrender
parent43f1abee2b7c8f2a1615ee98074b024156392dd9 (diff)
parent9bdf262d8511e84c2425e48a466b60f185516c76 (diff)
automated merge viewer2.0->viewe2.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;
}
}
}