diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
| commit | dce043b3177eb9a7d017af2a7e9f889a18668e77 (patch) | |
| tree | 1029565038ae3e23ee4e96e8432cb28ff80ba83c /indra/llui/llui.cpp | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (diff) | |
Merge from branch-test (EXT-1279)
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; } |