summaryrefslogtreecommitdiff
path: root/indra/newview/llsearchcombobox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-12 14:52:18 -0400
committerOz Linden <oz@lindenlab.com>2011-09-12 14:52:18 -0400
commite26bd6c140c24d72b44966127825fef5bbe47c1d (patch)
treec70214a7a7e898b528f6b0f3ec6d47992969fe97 /indra/newview/llsearchcombobox.cpp
parent08b75949998adbe3bbb4ef1d1d7e49405e468c94 (diff)
parent1c57963673193d5a3da638848c0540a5fbc91603 (diff)
merge changes for storm-1593 (marketplace inbox)
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
-rw-r--r--indra/newview/llsearchcombobox.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
index 6558c9a7fa..2824c70582 100644
--- a/indra/newview/llsearchcombobox.cpp
+++ b/indra/newview/llsearchcombobox.cpp
@@ -52,10 +52,9 @@ protected:
};
LLSearchComboBox::Params::Params()
-: search_button("search_button")
-, dropdown_button_visible("dropdown_button_visible", false)
-{
-}
+: search_button("search_button"),
+ dropdown_button_visible("dropdown_button_visible", false)
+{}
LLSearchComboBox::LLSearchComboBox(const Params&p)
: LLComboBox(p)