diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 16:33:49 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 16:33:49 +0800 |
| commit | 0098bf40ea73078e2164ae55a8fa2f9049d0d4e9 (patch) | |
| tree | 32cac232a7bacf814be61026598605d7a683c629 /indra/llrender/llfontgl.cpp | |
| parent | 28aa749db58b3a4095ca7e59811900767cd897b0 (diff) | |
undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 793a526c26..9ba0cfc6b8 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -754,6 +754,13 @@ std::string LLFontGL::nameFromFont(const LLFontGL* fontp) return fontp->mFontDescriptor.getName(); } + +// static +std::string LLFontGL::sizeFromFont(const LLFontGL* fontp) +{ + return fontp->mFontDescriptor.getSize(); +} + // static std::string LLFontGL::nameFromHAlign(LLFontGL::HAlign align) { |