diff options
| author | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
| commit | d9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch) | |
| tree | 1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/llrender | |
| parent | Merged working branch of 1.2 into LL 1.23 merge (diff) | |
| parent | Changed version to 1.20 in other files (diff) | |
| download | meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2 meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz | |
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/llrender')
| -rw-r--r-- | linden/indra/llrender/llfont.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp index 9245803..dd33128 100644 --- a/linden/indra/llrender/llfont.cpp +++ b/linden/indra/llrender/llfont.cpp | |||
| @@ -38,8 +38,7 @@ | |||
| 38 | #if !defined(LL_LINUX) || defined(LL_STANDALONE) | 38 | #if !defined(LL_LINUX) || defined(LL_STANDALONE) |
| 39 | # include <ft2build.h> | 39 | # include <ft2build.h> |
| 40 | #else | 40 | #else |
| 41 | // I had to do some work to avoid the system-installed FreeType headers... --ryan. | 41 | # include "ft2build.h" |
| 42 | # include "llfreetype2/freetype/ft2build.h" | ||
| 43 | #endif | 42 | #endif |
| 44 | 43 | ||
| 45 | // For some reason, this won't work if it's not wrapped in the ifdef | 44 | // For some reason, this won't work if it's not wrapped in the ifdef |