summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-23 11:38:33 -0400
committerOz Linden <oz@lindenlab.com>2011-05-23 11:38:33 -0400
commit551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch)
tree130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/llui/llcombobox.cpp
parent99fe1004a6cb4406bcac790420a5be6269e02723 (diff)
parente5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff)
merge latest changes (post-2.7.0) from viewer-development
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r--indra/llui/llcombobox.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 6f9893b07a..a4d1854bc8 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -231,6 +231,10 @@ void LLComboBox::resetDirty()
}
}
+bool LLComboBox::itemExists(const std::string& name)
+{
+ return mList->getItemByLabel(name);
+}
// add item "name" to menu
LLScrollListItem* LLComboBox::add(const std::string& name, EAddPosition pos, BOOL enabled)