aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llfontgl.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llrender/llfontgl.h
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/llrender/llfontgl.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index ce55385..4df1063 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -204,6 +204,8 @@ public:
204 static LLString nameFromVAlign(LLFontGL::VAlign align); 204 static LLString nameFromVAlign(LLFontGL::VAlign align);
205 static LLFontGL::VAlign vAlignFromName(const LLString& name); 205 static LLFontGL::VAlign vAlignFromName(const LLString& name);
206 206
207 static void setFontDisplay(BOOL flag) { sDisplayFont = flag ; }
208
207protected: 209protected:
208 struct embedded_data_t 210 struct embedded_data_t
209 { 211 {
@@ -222,6 +224,7 @@ public:
222 static F32 sHorizDPI; 224 static F32 sHorizDPI;
223 static F32 sScaleX; 225 static F32 sScaleX;
224 static F32 sScaleY; 226 static F32 sScaleY;
227 static BOOL sDisplayFont ;
225 static LLString sAppDir; // For loading fonts 228 static LLString sAppDir; // For loading fonts
226 229
227 static LLFontGL* sMonospace; // medium 230 static LLFontGL* sMonospace; // medium
@@ -246,7 +249,7 @@ public:
246protected: 249protected:
247 /*virtual*/ BOOL addChar(const llwchar wch); 250 /*virtual*/ BOOL addChar(const llwchar wch);
248 static LLString getFontPathLocal(); 251 static LLString getFontPathLocal();
249 static LLString getFontPathSystem(); 252 static LLString getFontPathSystem();
250 253
251protected: 254protected:
252 LLPointer<LLImageRaw> mRawImageGLp; 255 LLPointer<LLImageRaw> mRawImageGLp;