diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-01-20 15:59:05 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-01-20 15:59:05 -0500 |
commit | fd5ee757a5c9bb014fd021139e8b701a6007c9d0 (patch) | |
tree | b74be57b620d59a57abf7693eed56debd769b766 /indra/llui/llscrolllistctrl.h | |
parent | 362f288bc6c08f5f345b0b676ca5e3e1fae53c07 (diff) | |
parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) |
viewer2.0->viewer2.0 merge
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(); }; |