Second Life viewer sources 1.21.2-RC

1 files changed, 8 insertions, 15 deletions

diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index 02be0f9..ada5c68 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -157,8 +157,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
         msg->getU32Fast(_PREHASH_RequestData, _PREHASH_TotalObjectCount, total_count);
         msg->getU32Fast(_PREHASH_RequestData, _PREHASH_ReportType, mCurrentMode);
 
-        LLCtrlListInterface *list = childGetListInterface("objects_list");
-        if (!list) return;
+        LLScrollListCtrl *list = getChild<LLScrollListCtrl>("objects_list");
         
         S32 block_count = msg->getNumberOfBlocks("ReportData");
         for (S32 block = 0; block < block_count; ++block)
@@ -206,16 +205,16 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
                 element["columns"][3]["column"] = "location";
                 element["columns"][3]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
                 element["columns"][3]["font"] = "SANSSERIF";
-                element["columns"][3]["column"] = "time";
-                element["columns"][3]["value"] = formatted_time((time_t)time_stamp);
-                element["columns"][3]["font"] = "SANSSERIF";
+                element["columns"][4]["column"] = "time";
+                element["columns"][4]["value"] = formatted_time((time_t)time_stamp);
+                element["columns"][4]["font"] = "SANSSERIF";
 
                 if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
                         && have_extended_data)
                 {
-                        element["columns"][4]["column"] = "Mono Time";
-                        element["columns"][4]["value"] = llformat("%0.3f", mono_score);
-                        element["columns"][4]["font"] = "SANSSERIF";
+                        element["columns"][5]["column"] = "Mono Time";
+                        element["columns"][5]["value"] = llformat("%0.3f", mono_score);
+                        element["columns"][5]["font"] = "SANSSERIF";
                 }
                 
                 list->addElement(element);
@@ -228,13 +227,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 
         if (total_count == 0 && list->getItemCount() == 0)
         {
-                LLSD element;
-                element["id"] = LLUUID::null;
-                element["columns"][0]["column"] = "name";
-                element["columns"][0]["value"] = getString("none_descriptor");
-                element["columns"][0]["font"] = "SANSSERIF";
-
-                list->addElement(element);
+                list->addCommentText(getString("none_descriptor"));
         }
         else
         {