summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-15 14:14:46 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-15 14:14:46 -0700
commit590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (patch)
tree96e7e8d1ac31027c04a964a7c16c16ef3a0df6ba /indra/llrender/llfontgl.cpp
parent47e02d13f7e6307d9eb507177b88bbf0ab496894 (diff)
EXT-1279 Crash if font file not found.
Added getFontDefault() to llfontgl.h --HG-- branch : branch-test
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r--indra/llrender/llfontgl.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index f7bab3de67..16c99599cf 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -910,6 +910,13 @@ LLFontGL* LLFontGL::getFontByName(const std::string& name)
}
}
+//static
+LLFontGL* LLFontGL::getFontDefault()
+{
+ return getFontSansSerif(); // Fallback to sans serif as default font
+}
+
+
// static
std::string LLFontGL::getFontPathSystem()
{