diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 09:55:17 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 09:55:17 -0500 |
| commit | 4277d6b576836bd722d5100b709ebf923640109e (patch) | |
| tree | 9f738d428077f0b94786cc422af8b426c4ba2bcd /indra/llui/llscrolllistctrl.cpp | |
| parent | 83670fc520cf8f4f78446f853cae584c2970f4fc (diff) | |
| parent | 1a927f38d2266220f4000f35f64328476f9ffde6 (diff) | |
merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index a53a30b501..4e84013db0 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -142,6 +142,7 @@ LLScrollListCtrl::Params::Params() contents(""), scroll_bar_bg_visible("scroll_bar_bg_visible"), scroll_bar_bg_color("scroll_bar_bg_color") + , border("border") { name = "scroll_list"; mouse_opaque = true; @@ -231,10 +232,8 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) if (p.has_border) { LLRect border_rect = getLocalRect(); - LLViewBorder::Params params; - params.name("dig border"); + LLViewBorder::Params params = p.border; params.rect(border_rect); - params.bevel_style(LLViewBorder::BEVEL_IN); mBorder = LLUICtrlFactory::create<LLViewBorder> (params); addChild(mBorder); } |