diff options
| author | alain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com> | 2011-03-23 15:27:27 -0700 |
|---|---|---|
| committer | alain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com> | 2011-03-23 15:27:27 -0700 |
| commit | f59de62bb20a7ab6bebeca32321c256911f036d4 (patch) | |
| tree | 92d0d1f97a7820e565ec43aae36855a87c3d3bc0 | |
| parent | 63876746dd80321db569e162347d4dda56004bc4 (diff) | |
| parent | 976381059e9795c178ee7bb60973557a7323a7a8 (diff) | |
Merge
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index 543c4e6d1e..c08954bd16 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); |