aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterbump.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llfloaterbump.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterbump.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index ead50e8..ee26d6a 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/indra/newview/llfloaterbump.cpp
@@ -5,6 +5,7 @@
5 * 5 *
6 * Copyright (c) 2003-2007, Linden Research, Inc. 6 * Copyright (c) 2003-2007, Linden Research, Inc.
7 * 7 *
8 * Second Life Viewer Source Code
8 * The source code in this file ("Source Code") is provided by Linden Lab 9 * The source code in this file ("Source Code") is provided by Linden Lab
9 * to you under the terms of the GNU General Public License, version 2.0 10 * to you under the terms of the GNU General Public License, version 2.0
10 * ("GPL"), unless you have obtained a separate licensing agreement 11 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -82,9 +83,10 @@ void LLFloaterBump::show(void *contents)
82 if (gMeanCollisionList.isEmpty()) 83 if (gMeanCollisionList.isEmpty())
83 { 84 {
84 LLString none_detected = sInstance->childGetText("none_detected"); 85 LLString none_detected = sInstance->childGetText("none_detected");
85 LLScrollListItem *item = new LLScrollListItem(); 86 LLSD row;
86 item->addColumn(none_detected, LLFontGL::sSansSerifBold); 87 row["columns"][0]["value"] = none_detected;
87 list->addItem(item); 88 row["columns"][0]["font"] = "SansSerifBold";
89 list->addElement(row);
88 } 90 }
89 else 91 else
90 { 92 {
@@ -151,7 +153,9 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
151 text.setArg("[FIRST]", mcd->mFirstName); 153 text.setArg("[FIRST]", mcd->mFirstName);
152 text.setArg("[LAST]", mcd->mLastName); 154 text.setArg("[LAST]", mcd->mLastName);
153 155
154 LLScrollListItem *item = new LLScrollListItem(TRUE, NULL, mcd->mPerp); 156 LLSD row;
155 item->addColumn(text, LLFontGL::sSansSerifBold); 157 row["id"] = mcd->mPerp;
156 list->addItem(item); 158 row["columns"][0]["value"] = text;
159 row["columns"][0]["font"] = "SansSerifBold";
160 list->addElement(row);
157} 161}