From d3b192c26f2068383b22f15496500c1f961a72e8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 23 Mar 2011 13:39:31 -0700
Subject: STORM-1090 : Fix for use of freetype 2.4.4 and switch to freetype
 2.4.4 in installables

---
 autobuild.xml                     | 8 ++++----
 indra/llrender/llfontfreetype.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 425a5d37c3..1292a02136 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -498,9 +498,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f93758faf1d06f1427e0ecb846b17d48</string>
+              <string>c0eacb6348e032fbc69cfdc4bd215ee4</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/224777/arch/Darwin/installer/freetype-2.3.9-darwin-20110322.tar.bz2</string>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.4.4-darwin-20110307.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -522,9 +522,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>df9a3c0a572b1f18dce32f5a3caba0ea</string>
+              <string>271349827b939406162ce42e42cd18e0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/224777/arch/CYGWIN/installer/freetype-2.3.9-windows-20110322.tar.bz2</string>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.4.4-windows-20110218.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index b84e696e2d..91c8a37022 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -482,7 +482,7 @@ void LLFontFreetype::renderGlyph(U32 glyph_index) const
 	if (mFTFace == NULL)
 		return;
 
-	int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT );
+	int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_FORCE_AUTOHINT );
 	llassert(!error);
 
 	error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode);
-- 
cgit v1.2.3