summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-01-20 18:21:54 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-01-20 18:21:54 +0200
commitda00631c638acbf3d3b6ecbe5edb5abecf03252c (patch)
tree2b4d0da5271714c8602d02a43273686d1eca4319 /indra/llui/llscrolllistctrl.h
parent4028b720c9143b98097be51f49cc5d3dd664c8ec (diff)
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
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
-rw-r--r--indra/llui/llscrolllistctrl.h3
1 files changed, 3 insertions, 0 deletions
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();
};