aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
authorJacek Antonelli2009-11-03 01:05:36 -0600
committerJacek Antonelli2009-11-03 01:05:36 -0600
commitf0828916cc64c9a8528dcb4b61a71d52d98c16b1 (patch)
tree1e9db97ada206d9403d08bc2e059ab368cbd915d /linden/indra/llrender
parentUpdated ndofdev to the version used in SL 1.23.4. (diff)
downloadmeta-impy-f0828916cc64c9a8528dcb4b61a71d52d98c16b1.zip
meta-impy-f0828916cc64c9a8528dcb4b61a71d52d98c16b1.tar.gz
meta-impy-f0828916cc64c9a8528dcb4b61a71d52d98c16b1.tar.bz2
meta-impy-f0828916cc64c9a8528dcb4b61a71d52d98c16b1.tar.xz
Created our own Linux freetype package, 2.3.11.
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llfont.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index d7310bd..2ac7bdb 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -37,8 +37,7 @@
37#if !defined(LL_LINUX) || defined(LL_STANDALONE) 37#if !defined(LL_LINUX) || defined(LL_STANDALONE)
38# include <ft2build.h> 38# include <ft2build.h>
39#else 39#else
40// I had to do some work to avoid the system-installed FreeType headers... --ryan. 40# include "ft2build.h"
41# include "llfreetype2/freetype/ft2build.h"
42#endif 41#endif
43 42
44// For some reason, this won't work if it's not wrapped in the ifdef 43// For some reason, this won't work if it's not wrapped in the ifdef