diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
| commit | f1beac1a70e74bef5caf4850bd9146a583e00739 (patch) | |
| tree | 04dcca497b5b93d18d2b2cd093fa5fc3b2393925 /indra/llui/llui.cpp | |
| parent | 9a7f79cbcf57c46e797d2e5626d534055f9a256d (diff) | |
| parent | dce043b3177eb9a7d017af2a7e9f889a18668e77 (diff) | |
Merge from remote repo
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 c89e5944fa..eb1b60244d 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1954,7 +1954,12 @@ namespace LLInitParam return fontp; } } - + + if (mData.mValue == NULL) + { + mData.mValue = LLFontGL::getFontDefault(); + } + // default to current value return mData.mValue; } |