aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llcombobox.cpp7
-rw-r--r--linden/indra/llui/llcombobox.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index a93dc9b..f3ef83e 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -591,6 +591,13 @@ void LLComboBox::updateLayout()
591 } 591 }
592} 592}
593 593
594
595void LLComboBox::getAllData(std::vector<LLScrollListItem*>& item_list) const
596{
597 item_list = mList->getAllData();
598}
599
600
594void* LLComboBox::getCurrentUserdata() 601void* LLComboBox::getCurrentUserdata()
595{ 602{
596 LLScrollListItem* item = mList->getFirstSelected(); 603 LLScrollListItem* item = mList->getFirstSelected();
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 596f659..f92fe44 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -169,6 +169,7 @@ public:
169 169
170 //======================================================================== 170 //========================================================================
171 171
172 void getAllData(std::vector<LLScrollListItem*>& item_list) const;
172 void* getCurrentUserdata(); 173 void* getCurrentUserdata();
173 174
174 void setPrearrangeCallback( void (*cb)(LLUICtrl*,void*) ) { mPrearrangeCallback = cb; } 175 void setPrearrangeCallback( void (*cb)(LLUICtrl*,void*) ) { mPrearrangeCallback = cb; }