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

Some harmless reorganization

Browse Source
This commit is contained in:
Liru Færs
2020-01-10 16:06:44 -05:00
parent f1342d7bb8
commit 28f13b806c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llui/llscrolllistctrl.cpp
View File

@@ -2722,8 +2722,6 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
S32 search_column = 0; S32 search_column = 0;
node->getAttributeS32("search_column", search_column); node->getAttributeS32("search_column", search_column);
S32 sort_column = -1;
node->getAttributeS32("sort_column", sort_column);
BOOL sort_ascending = true; BOOL sort_ascending = true;
node->getAttributeBOOL("sort_ascending", sort_ascending); node->getAttributeBOOL("sort_ascending", sort_ascending);
@@ -2738,7 +2736,7 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
{ {
if (child->hasName("column") || child->hasName("columns") || child->hasName(kidcolumn) || child->hasName(kidcolumns)) if (child->hasName("column") || child->hasName("columns") || child->hasName(kidcolumn) || child->hasName(kidcolumns))
{ {
std::string labelname(""); std::string labelname;
if (child->getAttributeString("label", labelname)) if (child->getAttributeString("label", labelname))
columns[index]["label"] = labelname; columns[index]["label"] = labelname;
else if (child->getAttributeString("image", labelname)) else if (child->getAttributeString("image", labelname))
@@ -2791,11 +2789,6 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
} }
setColumnHeadings(columns); setColumnHeadings(columns);
if (sort_column >= 0)
{
sortByColumnIndex(sort_column, sort_ascending);
}
const std::string kidrow(nodename + "row"); const std::string kidrow(nodename + "row");
const std::string kidrows(nodename + "rows"); const std::string kidrows(nodename + "rows");
for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling()) for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
@@ -2850,6 +2843,13 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
} }
} }
S32 sort_column = -1;
node->getAttributeS32("sort_column", sort_column);
if (sort_column >= 0)
{
sortByColumnIndex(sort_column, sort_ascending);
}
setCommentText(node->getTextContents()); setCommentText(node->getTextContents());
} }