diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
commit | cdf639087011dc7f4510cedd9951e8d890818b97 (patch) | |
tree | 6d70a6994ab11f0677370dda4f80a205d00660a1 /indra/llui/llui.cpp | |
parent | 7335c6276865061d8b4a549b7cf29f8a8df929a0 (diff) | |
parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) |
merging in viewer2 changes
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llui/llui.cpp')
-rw-r--r-- | indra/llui/llui.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 48504a1e54..a82e6eb372 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1953,11 +1953,6 @@ namespace LLInitParam } } - if (mData.mValue == NULL) - { - mData.mValue = LLFontGL::getFontDefault(); - } - // default to current value return mData.mValue; } |