From 31e2fdc16ef462fc7de3b62257391ac601ec170c Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 4 Nov 2013 22:56:36 -0500
Subject: [PATCH] Allow v3 xui alternative naming of combo_item as
 combo_box.item

---
 indra/llui/llcombobox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 64d003f0b..7c8e1afeb 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -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);