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

Allow v3 xui alternative naming of combo_item as combo_box.item

Browse Source
This commit is contained in:
Inusaito Sayori
2013-11-04 22:56:36 -05:00
parent f935453859
commit 31e2fdc16e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llcombobox.cpp
View File

@@ -171,9 +171,10 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
LLXMLNodePtr child;
for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
{
if (child->hasName("combo_item"))
if (child->hasName("combo_item") || child->hasName("combo_box.item"))
{
std::string label = child->getTextContents();
child->getAttributeString("label", label);
std::string value = label;
child->getAttributeString("value", value);