Merge

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index b7848ec37c..622f3e215c 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -147,12 +147,9 @@ LLScrollListCtrl::Params::Params()
 	highlighted_color("highlighted_color"),
 	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;
-}
+	scroll_bar_bg_color("scroll_bar_bg_color"), 
+	border("border")
+{}
 
 LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
 :	LLUICtrl(p),
@@ -2813,7 +2810,10 @@ LLScrollListItem* LLScrollListCtrl::addRow(LLScrollListItem *new_item, const LLS
 		}
 
 		S32 index = columnp->mIndex;
-		cell_p.width.setIfNotProvided(columnp->getWidth());
+		if (!cell_p.width.isProvided())
+		{
+			cell_p.width = columnp->getWidth();
+		}
 
 		LLScrollListCell* cell = LLScrollListCell::create(cell_p);