svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 9 insertions, 6 deletions

diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index 969124a81c..68f002f9d9 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -63,9 +63,10 @@ void LLFloaterBump::show(void *contents)
 	if (gMeanCollisionList.isEmpty())
 	{
 		LLString none_detected = sInstance->childGetText("none_detected");
-		LLScrollListItem *item = new LLScrollListItem();
-		item->addColumn(none_detected, LLFontGL::sSansSerifBold);
-		list->addItem(item);		
+		LLSD row;
+		row["columns"][0]["value"] = none_detected;
+		row["columns"][0]["font-style"] = "BOLD";
+		list->addElement(row);
 	}
 	else
 	{
@@ -132,7 +133,9 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
 	text.setArg("[FIRST]", mcd->mFirstName);
 	text.setArg("[LAST]", mcd->mLastName);
 
-	LLScrollListItem *item = new LLScrollListItem(TRUE, NULL, mcd->mPerp);
-	item->addColumn(text, LLFontGL::sSansSerifBold);
-	list->addItem(item);
+	LLSD row;
+	row["id"] = mcd->mPerp;
+	row["columns"][0]["value"] = text;
+	row["columns"][0]["font-style"] = "BOLD";
+	list->addElement(row);
 }