aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lltextbox.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:01 -0500
committerJacek Antonelli2008-08-15 23:45:01 -0500
commit28d8d4e7664bcd6c8369cc18832e42096af7cad2 (patch)
tree069020fe66339aff2ca4176370ff743b14713f2d /linden/indra/llui/lltextbox.cpp
parentSecond Life viewer sources 1.17.2.0 (diff)
downloadmeta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.zip
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.gz
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.bz2
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.xz
Second Life viewer sources 1.17.3.0
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/lltextbox.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index c4f2cea..ba0747f 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -439,6 +439,7 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
439 text, 439 text,
440 font, 440 font,
441 FALSE); 441 FALSE);
442
442 443
443 LLFontGL::HAlign halign = LLView::selectFontHAlign(node); 444 LLFontGL::HAlign halign = LLView::selectFontHAlign(node);
444 text_box->setHAlign(halign); 445 text_box->setHAlign(halign);
@@ -450,6 +451,12 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
450 { 451 {
451 text_box->mFontStyle = LLFontGL::getStyleFromString(font_style); 452 text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
452 } 453 }
454
455 BOOL mouse_opaque;
456 if (node->getAttributeBOOL("mouse_opaque", mouse_opaque))
457 {
458 text_box->setMouseOpaque(mouse_opaque);
459 }
453 460
454 if(node->hasAttribute("text_color")) 461 if(node->hasAttribute("text_color"))
455 { 462 {