summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-05-24 11:57:35 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-05-24 11:57:35 -0400
commit00ad0c425398dd748f4759243dc789199a73e87d (patch)
tree801ab4805be44117bda3a6d35e18161cc3ccd1c5 /indra/llui/llcombobox.cpp
parente677e5e77114cfbfcd7c5e838922fdf8d12853fb (diff)
parente5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff)
merge up to latest viewer-development with mesh changes
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)