Second Life viewer sources 1.15.1.3

1 files changed, 10 insertions, 6 deletions

diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index 884d638..c4f2cea 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -48,7 +48,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLRect& rect, const LLString& t
         mBorderColor(           LLUI::sColorsGroup->getColor( "DefaultHighlightLight" ) ),
         mBackgroundVisible( FALSE ),
         mBorderVisible( FALSE ),
-        mDropshadowVisible( TRUE ),
+        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
         mBorderDropShadowVisible( FALSE ),
         mHPad(0),
         mVPad(0),
@@ -73,7 +73,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLString& text, F32 max_width,
         mBorderColor(LLUI::sColorsGroup->getColor("DefaultHighlightLight")),
         mBackgroundVisible(FALSE),
         mBorderVisible(FALSE),
-        mDropshadowVisible(TRUE),
+        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
         mBorderDropShadowVisible(FALSE),
         mHPad(0),
         mVPad(0),
@@ -363,7 +363,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
                         S32 line_length = *iter;
                         mFontGL->render(mText.getWString(), cur_pos, (F32)x, (F32)y, color,
                                                         mHAlign, mVAlign,
-                                                        mDropshadowVisible ? LLFontGL::DROP_SHADOW : LLFontGL::NORMAL,
+                                                        mFontStyle,
                                                         line_length, mRect.getWidth(), NULL, TRUE );
                         cur_pos += line_length + 1;
                         y -= llfloor(mFontGL->getLineHeight());
@@ -373,7 +373,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
         {
                 mFontGL->render(mText.getWString(), 0, (F32)x, (F32)y, color,
                                                 mHAlign, mVAlign, 
-                                                mDropshadowVisible ? LLFontGL::DROP_SHADOW : LLFontGL::NORMAL,
+                                                mFontStyle,
                                                 S32_MAX, mRect.getWidth(), NULL, TRUE);
         }
 }
@@ -406,8 +406,6 @@ LLXMLNodePtr LLTextBox::getXML(bool save_children) const
 
         node->createChild("border_visible", TRUE)->setBoolValue(mBorderVisible);
 
-        node->createChild("drop_shadow_visible", TRUE)->setBoolValue(mDropshadowVisible);
-
         node->createChild("border_drop_shadow_visible", TRUE)->setBoolValue(mBorderDropShadowVisible);
 
         node->createChild("h_pad", TRUE)->setIntValue(mHPad);
@@ -447,6 +445,12 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
         text_box->initFromXML(node, parent);
 
+        LLString font_style;
+        if (node->getAttributeString("font-style", font_style))
+        {
+                text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
+        }
+
         if(node->hasAttribute("text_color"))
         {
                 LLColor4 color;