diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
commit | 939e48d38cf9f15e1f7220cc3860810badd8a778 (patch) | |
tree | e7135ea43d8945c173c5cade2c3767193fa76f56 /indra/llrender/llfontgl.cpp | |
parent | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (diff) | |
parent | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (diff) |
merge.
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) { |