From 6fcf38217e8772b2f90c7a8e7ce6b60071f6d20c Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 25 Mar 2008 22:50:26 +0000
Subject: merge release@82858 maint-render-2-merge@83010 -> release QAR-389

---
 indra/llrender/llfontgl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llrender/llfontgl.cpp')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 2e767ebb9c..df9dca3af5 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -47,6 +47,7 @@ F32 LLFontGL::sVertDPI = 96.f;
 F32 LLFontGL::sHorizDPI = 96.f;
 F32 LLFontGL::sScaleX = 1.f;
 F32 LLFontGL::sScaleY = 1.f;
+BOOL LLFontGL::sDisplayFont = TRUE ;
 LLString LLFontGL::sAppDir;
 
 LLFontGL* LLFontGL::sMonospace = NULL;
@@ -557,6 +558,11 @@ S32 LLFontGL::render(const LLWString &wstr,
 					 BOOL use_embedded,
 					 BOOL use_ellipses) const
 {
+	if(!sDisplayFont) //do not display texts
+	{
+		return wstr.length() ;
+	}
+
 	LLGLEnable tex(GL_TEXTURE_2D);
 
 	if (wstr.empty())
-- 
cgit v1.2.3