diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
| commit | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (patch) | |
| tree | 751731e4b23e08264caf6436ae2c60cff8094240 /indra/llui/llui.cpp | |
| parent | b43771cad585cb9820941eb1b24b67390eaa9435 (diff) | |
| parent | 127b428863707c882fbf4d30699321b8a2365644 (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; } |