diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
| commit | b4275c5d48c8cdf4bbe206822878fcf615897ac9 (patch) | |
| tree | 4ef9b931f0a9c8f2b3073c5c33e06672fa56d345 /indra/llui/llui.cpp | |
| parent | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (diff) | |
| parent | cb1b361b49c9ae6a76eaeeb4476a341a024a71f1 (diff) | |
merge
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index f253857851..da9384f876 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1952,7 +1952,12 @@ namespace LLInitParam return fontp; } } - + + if (mData.mValue == NULL) + { + mData.mValue = LLFontGL::getFontDefault(); + } + // default to current value return mData.mValue; } |