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

Add support for a bunch of v3isms to scroll list xml parsing

Browse Source
This commit is contained in:
Liru Færs
2019-10-10 18:57:42 -04:00
parent 93e30f44c0
commit 43163b400d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llscrolllistctrl.cpp
View File

@@ -2744,10 +2744,11 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
LLSD columns;
S32 index = 0;
const std::string nodename(std::string(node->getName()->mString) + '.');
const std::string kidcolumn(nodename + "columns");
const std::string kidcolumns(nodename + "columns");
const std::string kidcolumn(nodename + "column");
for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
{
if (child->hasName("column") || child->hasName(kidcolumn))
if (child->hasName("column") || child->hasName("columns") || child->hasName(kidcolumn) || child->hasName(kidcolumns))
{
std::string labelname("");
if (child->getAttributeString("label", labelname))
@@ -2827,9 +2828,10 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
bool explicit_column = false;
for (LLXMLNodePtr row_child = child->getFirstChild(); row_child.notNull(); row_child = row_child->getNextSibling())
{
if (row_child->hasName("column"))
if (row_child->hasName("column") || row_child->hasName("columns"))
{
std::string value = row_child->getTextContents();
row_child->getAttributeString("value", value);
row["columns"][column_idx]["value"] = value;
std::string columnname;