diff options
| author | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
| commit | 31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch) | |
| tree | c4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llrender/llfontgl.h | |
| parent | Second Life viewer sources 1.19.1.1 (diff) | |
| download | meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2 meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz | |
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/llrender/llfontgl.h')
| -rw-r--r-- | linden/indra/llrender/llfontgl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h index f740039..ce55385 100644 --- a/linden/indra/llrender/llfontgl.h +++ b/linden/indra/llrender/llfontgl.h | |||
| @@ -97,7 +97,9 @@ public: | |||
| 97 | 97 | ||
| 98 | static bool loadFaceFallback(LLFontList *fontp, const LLString& fontname, const F32 point_size); | 98 | static bool loadFaceFallback(LLFontList *fontp, const LLString& fontname, const F32 point_size); |
| 99 | static bool loadFace(LLFontGL *fontp, const LLString& fontname, const F32 point_size, LLFontList *fallback_fontp); | 99 | static bool loadFace(LLFontGL *fontp, const LLString& fontname, const F32 point_size, LLFontList *fallback_fontp); |
| 100 | BOOL loadFace(const LLString& filename, const F32 point_size, const F32 vert_dpi, const F32 horz_dpi); | 100 | /* virtual*/ BOOL loadFace(const std::string& filename, |
| 101 | const F32 point_size, const F32 vert_dpi, const F32 horz_dpi, | ||
| 102 | const S32 components, BOOL is_fallback); | ||
| 101 | 103 | ||
| 102 | 104 | ||
| 103 | S32 renderUTF8(const LLString &text, const S32 begin_offset, | 105 | S32 renderUTF8(const LLString &text, const S32 begin_offset, |