diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llui/llresmgr.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llresmgr.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp index d111bd6..32d3d1f 100644 --- a/linden/indra/llui/llresmgr.cpp +++ b/linden/indra/llui/llresmgr.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -54,11 +55,11 @@ LLResMgr::LLResMgr() | |||
54 | { | 55 | { |
55 | mUSAFonts[i] = NULL; | 56 | mUSAFonts[i] = NULL; |
56 | } | 57 | } |
57 | mUSAFonts[ LLFONT_OCRA ] = LLFontGL::sMonospace; | 58 | mUSAFonts[ LLFONT_OCRA ] = LLFontGL::getFontMonospace(); |
58 | mUSAFonts[ LLFONT_SANSSERIF ] = LLFontGL::sSansSerif; | 59 | mUSAFonts[ LLFONT_SANSSERIF ] = LLFontGL::getFontSansSerif(); |
59 | mUSAFonts[ LLFONT_SANSSERIF_SMALL ] = LLFontGL::sSansSerifSmall; | 60 | mUSAFonts[ LLFONT_SANSSERIF_SMALL ] = LLFontGL::getFontSansSerifSmall(); |
60 | mUSAFonts[ LLFONT_SANSSERIF_BIG ] = LLFontGL::sSansSerifBig; | 61 | mUSAFonts[ LLFONT_SANSSERIF_BIG ] = LLFontGL::getFontSansSerifBig(); |
61 | mUSAFonts[ LLFONT_SMALL ] = LLFontGL::sMonospace; | 62 | mUSAFonts[ LLFONT_SMALL ] = LLFontGL::getFontMonospace(); |
62 | /* | 63 | /* |
63 | // USA Strings | 64 | // USA Strings |
64 | for( i=0; i<LLSTR_COUNT; i++ ) | 65 | for( i=0; i<LLSTR_COUNT; i++ ) |