diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
| commit | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch) | |
| tree | af7409521b24318b7c48a7434824178888c17a3e /indra/llrender | |
| parent | 0009346667872b90d39089c3800ab3e00ce73b51 (diff) | |
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 05163c0782..7c0289b580 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -1311,7 +1311,7 @@ LLString LLFontGL::nameFromFont(const LLFontGL* fontp) { if (fontp == sSansSerifHuge) { - return LLString("SansSerifHude"); + return LLString("SansSerifHuge"); } else if (fontp == sSansSerifSmall) { |