From e5124431b54d4342d4677371fccca5bc7250c079 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Mon, 2 Jul 2007 17:10:30 +0000 Subject: svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release --- indra/llui/lltextbox.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/llui/lltextbox.cpp') diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 48ff6afbd5..f15383c6f7 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -419,6 +419,7 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f text, font, FALSE); + LLFontGL::HAlign halign = LLView::selectFontHAlign(node); text_box->setHAlign(halign); @@ -430,6 +431,12 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f { text_box->mFontStyle = LLFontGL::getStyleFromString(font_style); } + + BOOL mouse_opaque; + if (node->getAttributeBOOL("mouse_opaque", mouse_opaque)) + { + text_box->setMouseOpaque(mouse_opaque); + } if(node->hasAttribute("text_color")) { -- cgit v1.2.3