From 43163b400ddd1a2d39bdc0d2acf0e85772f60434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Thu, 10 Oct 2019 18:57:42 -0400 Subject: [PATCH] Add support for a bunch of v3isms to scroll list xml parsing --- indra/llui/llscrolllistctrl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index d1a187d0c..f46775f6f 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -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;