1 files changed, 40 insertions, 23 deletions

diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index a6efb06..ada5c68 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -44,6 +44,7 @@
 #include "lllineeditor.h"
 #include "lltextbox.h"
 #include "lltracker.h"
+#include "llviewermessage.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "lluictrlfactory.h"
@@ -51,6 +52,8 @@
 
 LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
 
+// Globals
+// const U32 TIME_STR_LENGTH = 30;
 
 // static
 void LLFloaterTopObjects::show()
@@ -67,7 +70,7 @@ void LLFloaterTopObjects::show()
 }
 
 LLFloaterTopObjects::LLFloaterTopObjects()
-:       LLFloater("top_objects"),
+:       LLFloater(std::string("top_objects")),
         mInitialized(FALSE),
         mtotalScore(0.f)
 {
@@ -124,7 +127,7 @@ BOOL LLFloaterTopObjects::postBuild()
 
         mCurrentMode = STAT_REPORT_TOP_SCRIPTS;
         mFlags = 0;
-        mFilter = "";
+        mFilter.clear();
 
         return TRUE;
 }
@@ -154,18 +157,20 @@ 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)
         {
                 U32 task_local_id;
+                U32 time_stamp = 0;
                 LLUUID task_id;
                 F32 location_x, location_y, location_z;
                 F32 score;
-                char name_buf[MAX_STRING];              /* Flawfinder: ignore */
-                char owner_buf[MAX_STRING];             /* Flawfinder: ignore */
+                std::string name_buf;
+                std::string owner_buf;
+                F32 mono_score = 0.f;
+                bool have_extended_data = false;
 
                 msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
                 msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
@@ -173,17 +178,24 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
                 msg->getF32Fast(_PREHASH_ReportData, _PREHASH_LocationY, location_y, block);
                 msg->getF32Fast(_PREHASH_ReportData, _PREHASH_LocationZ, location_z, block);
                 msg->getF32Fast(_PREHASH_ReportData, _PREHASH_Score, score, block);
-                msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, MAX_STRING, name_buf, block);
-                msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, MAX_STRING, owner_buf, block);
-                
+                msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, name_buf, block);
+                msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, owner_buf, block);
+                if(msg->getNumberOfBlocks("DataExtended"))
+                {
+                        have_extended_data = true;
+                        msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
+                        msg->getF32(_PREHASH_ReportData, "MonoScore", mono_score, block);
+                }
+
                 LLSD element;
 
                 element["id"] = task_id;
-                element["object_name"] = LLString(name_buf);
-                element["owner_name"] = LLString(owner_buf);
+                element["object_name"] = name_buf;
+                element["owner_name"] = owner_buf;
                 element["columns"][0]["column"] = "score";
                 element["columns"][0]["value"] = llformat("%0.3f", score);
                 element["columns"][0]["font"] = "SANSSERIF";
+                
                 element["columns"][1]["column"] = "name";
                 element["columns"][1]["value"] = name_buf;
                 element["columns"][1]["font"] = "SANSSERIF";
@@ -193,7 +205,18 @@ 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"][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"][5]["column"] = "Mono Time";
+                        element["columns"][5]["value"] = llformat("%0.3f", mono_score);
+                        element["columns"][5]["font"] = "SANSSERIF";
+                }
+                
                 list->addElement(element);
                 
                 mObjectListData.append(element);
@@ -204,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
         {
@@ -393,7 +410,7 @@ void LLFloaterTopObjects::onRefresh(void* data)
 {
         U32 mode = STAT_REPORT_TOP_SCRIPTS;
         U32 flags = 0;
-        LLString filter = "";
+        std::string filter = "";
 
         if (sInstance)
         {
@@ -418,7 +435,7 @@ void LLFloaterTopObjects::onRefresh(void* data)
 
         if (sInstance)
         {
-                sInstance->mFilter = "";
+                sInstance->mFilter.clear();
                 sInstance->mFlags = 0;
         }
 }
@@ -451,8 +468,8 @@ void LLFloaterTopObjects::showBeacon()
         LLScrollListItem* first_selected = list->getFirstSelected();
         if (!first_selected) return;
 
-        LLString name = first_selected->getColumn(1)->getValue().asString();
-        LLString pos_string =  first_selected->getColumn(3)->getValue().asString();
+        std::string name = first_selected->getColumn(1)->getValue().asString();
+        std::string pos_string =  first_selected->getColumn(3)->getValue().asString();
 
         F32 x, y, z;
         S32 matched = sscanf(pos_string.c_str(), "<%g,%g,%g>", &x, &y, &z);
@@ -460,6 +477,6 @@ void LLFloaterTopObjects::showBeacon()
 
         LLVector3 pos_agent(x, y, z);
         LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);
-        LLString tooltip("");
+        std::string tooltip("");
         LLTracker::trackLocation(pos_global, name, tooltip, LLTracker::LOCATION_ITEM);
 }