merged in jacek's quickfilter and gstreamer branches

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 9a2e13b..cb9dd4e 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -194,6 +194,11 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 
                                 combo_box->add(label, LLSD(value) );
                         }
+
+      else if (child->hasName("separator"))
+                        {
+                                combo_box->addSeparator();
+                        }
                 }
         }