diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-08-24 20:04:52 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-08-24 20:04:52 +0000 |
| commit | 138bf1132262c479dbbd5c95195db46b1efd065f (patch) | |
| tree | be2286f245865008b4ca6d738194133542822d65 /indra/llrender/llfontregistry.cpp | |
| parent | c2619694fd2f94ad7da2d6e936494f4c16601212 (diff) | |
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
Diffstat (limited to 'indra/llrender/llfontregistry.cpp')
| -rw-r--r-- | indra/llrender/llfontregistry.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 553e7b8f9d..99f364a589 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -477,7 +477,6 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) if (result) { - result->mFontFreetype->setStyle(match_desc->getStyle()); result->mFontDescriptor = desc; } else |