Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Meeting Request: Pick up LL's changes to land impact (Also introduces Land Impact floater)

Browse Source 
Small change to lltextbox allowing us to use value attribute with <text/>'s YAY!!

Cleaned up in llfloatertools as well to better diff.
This commit is contained in:
Inusaito Sayori
2014-05-23 06:19:43 -04:00
parent 2ce3f2c131
commit 828941a204
20 changed files with 1112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/lltextbox.cpp
View File

@@ -395,8 +395,14 @@ void LLTextBox::initFromXML(LLXMLNodePtr node, LLView* parent)
LLFontGL* font = LLView::selectFont(node);
if(font)
mFontGL = font;
setText(node->getTextContents());
if (node->hasAttribute("value"))
{
std::string text;
node->getAttributeString("value", text);
setText(text);
}
else setText(node->getTextContents());
LLFontGL::HAlign halign = LLView::selectFontHAlign(node);
setHAlign(halign);