diff options
| author | elektrahesse | 2010-10-24 12:43:58 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-10-24 12:43:58 +0200 |
| commit | d1dff548084a07e49aaa43b5af6b63e14e369925 (patch) | |
| tree | 17e7399b82245d10f8e9e516f9cabffa0870667f /linden/indra/llrender/llfontregistry.cpp | |
| parent | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly (diff) | |
| parent | Fixed xml files from the German translation missing from the repo (diff) | |
| download | meta-impy-d1dff548084a07e49aaa43b5af6b63e14e369925.zip meta-impy-d1dff548084a07e49aaa43b5af6b63e14e369925.tar.gz meta-impy-d1dff548084a07e49aaa43b5af6b63e14e369925.tar.bz2 meta-impy-d1dff548084a07e49aaa43b5af6b63e14e369925.tar.xz | |
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
Diffstat (limited to 'linden/indra/llrender/llfontregistry.cpp')
| -rw-r--r-- | linden/indra/llrender/llfontregistry.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp index 9792a91..c5923cd 100644 --- a/linden/indra/llrender/llfontregistry.cpp +++ b/linden/indra/llrender/llfontregistry.cpp | |||
| @@ -442,7 +442,15 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) | |||
| 442 | std::string font_path = local_path + *file_name_it; | 442 | std::string font_path = local_path + *file_name_it; |
| 443 | BOOL is_fallback = !is_first_found; | 443 | BOOL is_fallback = !is_first_found; |
| 444 | F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult()); | 444 | F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult()); |
| 445 | F32 size = (F32)llround(point_size * size_mult); | 445 | if (gSavedSettings.getF32("FontSizeMultiplier") > 0) |
| 446 | { | ||
| 447 | size_mult *= gSavedSettings.getF32("FontSizeMultiplier"); | ||
| 448 | } | ||
| 449 | F32 size = (F32)(point_size * size_mult); | ||
| 450 | if (gSavedSettings.getBOOL("FontSizeRounding")) | ||
| 451 | { | ||
| 452 | size = (F32)llround(size); | ||
| 453 | } | ||
| 446 | if (!fontp->loadFace(font_path, size, | 454 | if (!fontp->loadFace(font_path, size, |
| 447 | LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback)) | 455 | LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback)) |
| 448 | { | 456 | { |