diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
| commit | 642d368eccd662494a4958a50ba2bd3301b5207e (patch) | |
| tree | 0aaa9d2981260051009e765a6171ad328f031183 /indra/llui/llui.cpp | |
| parent | c7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff) | |
| parent | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (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; } |