From da00631c638acbf3d3b6ecbe5edb5abecf03252c Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 20 Jan 2010 18:21:54 +0200
Subject: Update for low bug EXT-4371 - Text from search history drop-down list
 merge with landmarks on 'Favorites Bar'. Made border customisable in combo
 box.

--HG--
branch : product-engine
---
 indra/llui/llscrolllistctrl.h | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 78bc60db6e..907dc90bea 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -51,6 +51,7 @@
 #include "lldate.h"
 #include "llscrolllistitem.h"
 #include "llscrolllistcolumn.h"
+#include "llviewborder.h"
 
 class LLScrollListCell;
 class LLTextBox;
@@ -109,6 +110,8 @@ public:
 							scroll_bar_bg_color;
 
 		Optional<Contents> contents;
+
+		Optional<LLViewBorder::Params> border;
 		
 		Params();
 	};
-- 
cgit v1.2.3