Merge

4 files changed, 43 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
new file mode 100644
index 0000000000..eabacbecb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<accordion_tab 
+    header_collapse_img="accordion_collapsed.tga" 
+    header_collapse_img_pressed="accordion_collapsed.tga" 
+    header_expand_img="accordion_expanded.tga"
+    header_expand_img_pressed="accordion_expanded.tga" />
diff --git a/indra/newview/skins/default/xui/en/widgets/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml
new file mode 100644
index 0000000000..4a59716464
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/list.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list
+ allow_select="true"
+ bg_opaque_color="PanelFocusBackgroundColor"
+ bg_alpha_color="PanelDefaultBackgroundColor"
+ background_visible="false"
+ background_opaque="false"
+ item_pad="5"
+ keep_one_selected="true"
+ multi_select="false" />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 8f4d0edf95..297a3762f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -43,7 +43,7 @@
                           label=""
                           pad_right="0"
                           tool_tip="My Location History"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor"/>
+  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"/>
   <combo_editor name="Combo Text Entry"
                 text_pad_left="20"
                 select_on_focus="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
new file mode 100644
index 0000000000..1d43b25f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<search_combo_box
+ allow_text_entry="true"
+ list_position="BELOW"
+ show_text_as_tentative="false"
+ dropdown_button_visible="false"
+ background_image="TextField_Search_Off"
+ background_image_disabled="TextField_Search_Disabled"
+ background_image_focused="TextField_Search_Active">
+ <combo_editor
+  select_on_focus="true"
+  text_pad_left="20" 
+  background_image="TextField_Search_Off"
+  background_image_disabled="TextField_Search_Disabled"
+  background_image_focused="TextField_Search_Active"/>
+ <combo_list
+  multi_select="false"
+  page_lines="10" />
+ <search_button label=""
+  top_pad="4"
+  left_pad="4" 
+  width="13"
+  height="13" 
+  image_unselected="Search"
+  image_selected="Search" />
+</search_combo_box>
\ No newline at end of file