diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
| commit | 8aadfb1cb63a9527835c6c5127d041d924455505 (patch) | |
| tree | 3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/llui/llscrolllistctrl.h | |
| parent | 622f8b59ceb286f955351b6185a98919f03ed136 (diff) | |
| parent | 20af2d325a4340aca997efbea752849e9f15d041 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 3 |
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(); }; |