diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llrender/llfontgl.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/llrender/llfontgl.cpp')
-rw-r--r-- | linden/indra/llrender/llfontgl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp index 9298e8c..53e8c2b 100644 --- a/linden/indra/llrender/llfontgl.cpp +++ b/linden/indra/llrender/llfontgl.cpp | |||
@@ -47,6 +47,7 @@ F32 LLFontGL::sVertDPI = 96.f; | |||
47 | F32 LLFontGL::sHorizDPI = 96.f; | 47 | F32 LLFontGL::sHorizDPI = 96.f; |
48 | F32 LLFontGL::sScaleX = 1.f; | 48 | F32 LLFontGL::sScaleX = 1.f; |
49 | F32 LLFontGL::sScaleY = 1.f; | 49 | F32 LLFontGL::sScaleY = 1.f; |
50 | BOOL LLFontGL::sDisplayFont = TRUE ; | ||
50 | LLString LLFontGL::sAppDir; | 51 | LLString LLFontGL::sAppDir; |
51 | 52 | ||
52 | LLFontGL* LLFontGL::sMonospace = NULL; | 53 | LLFontGL* LLFontGL::sMonospace = NULL; |
@@ -559,6 +560,11 @@ S32 LLFontGL::render(const LLWString &wstr, | |||
559 | BOOL use_embedded, | 560 | BOOL use_embedded, |
560 | BOOL use_ellipses) const | 561 | BOOL use_ellipses) const |
561 | { | 562 | { |
563 | if(!sDisplayFont) //do not display texts | ||
564 | { | ||
565 | return wstr.length() ; | ||
566 | } | ||
567 | |||
562 | LLGLEnable tex(GL_TEXTURE_2D); | 568 | LLGLEnable tex(GL_TEXTURE_2D); |
563 | 569 | ||
564 | if (wstr.empty()) | 570 | if (wstr.empty()) |