diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
| commit | 92cef0426df15c0e661fa795e6b00214f381dd05 (patch) | |
| tree | 4aa5f2277e140e98c381bdcd0facba64d4f0deca /indra/llui/llscrolllistctrl.cpp | |
| parent | c6163fafaac9c72683b11894ed309d1f55a745c8 (diff) | |
| parent | 7f61cde331880baa21801aa0c1c1ccf9dc57946f (diff) | |
automated merge from trunk
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); } |