From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 6 Jul 2009 21:58:04 +0000
Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color
 changes, also UI color refactoring and new FreeType font library on Linux.
 svn merge -r126038:126164
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

---
 indra/llui/llcombobox.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llui/llcombobox.h')

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index bc98690a01..cb5f72dcbe 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -84,7 +84,6 @@ public:
 		Optional<commit_callback_t> 		prearrange_callback,
 											text_entry_callback,
 											selection_callback;
-		Optional<LLUIImage*>				arrow_image;
 
 		Optional<EPreferredPosition, PreferredPositionValues>	list_position;
 		
@@ -93,6 +92,8 @@ public:
 		Optional<LLScrollListCtrl::Params>	combo_list;
 		Optional<LLLineEditor::Params>		combo_editor;
 
+		Optional<LLButton::Params>          drop_down_button;
+
 		Multiple<ItemParams>				items;
 		
 		Params();
-- 
cgit v1.2.3