summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
commitf38fa6a7357a91fcede3713cfce4971f0b0d5dfa (patch)
tree07ccb7b989cce22cfae95841802fc74d0749c040 /indra/llui/llscrolllistctrl.h
parentf009fbcb03e7d4e87d41f60e2873ffcbcb02354b (diff)
parent8758fac7124ff07f2a003bf5719c19a4dab170b9 (diff)
PE merge.
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();
};