From 00716781a30de3eb57dc36d2128b0afd56571c99 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 16 Feb 2009 11:48:17 -0700
Subject: Backported Top Scripts changes from 1.22

---
 linden/indra/newview/llfloatertopobjects.cpp                   |  6 ++++--
 .../newview/skins/default/xui/en-us/floater_top_objects.xml    | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index ada5c68..0afa618 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -180,7 +180,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		msg->getF32Fast(_PREHASH_ReportData, _PREHASH_Score, score, block);
 		msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, name_buf, block);
 		msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, owner_buf, block);
-		if(msg->getNumberOfBlocks("DataExtended"))
+		if(msg->has("DataExtended"))
 		{
 			have_extended_data = true;
 			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
@@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
 			&& have_extended_data)
 		{
-			element["columns"][5]["column"] = "Mono Time";
+			element["columns"][5]["column"] = "mono_time";
 			element["columns"][5]["value"] = llformat("%0.3f", mono_score);
 			element["columns"][5]["font"] = "SANSSERIF";
 		}
@@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	{
 		setTitle(getString("top_scripts_title"));
 		list->setColumnLabel("score", getString("scripts_score_label"));
+		list->setColumnLabel("mono_time", getString("scripts_mono_time_label"));
 		
 		LLUIString format = getString("top_scripts_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
@@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	{
 		setTitle(getString("top_colliders_title"));
 		list->setColumnLabel("score", getString("colliders_score_label"));
+		list->setColumnLabel("mono_time", "");
 		LLUIString format = getString("top_colliders_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
 		childSetValue("title_text", LLSD(format));
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 96f48eb..1b60510 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -14,7 +14,8 @@
 		<column label="Owner" name="owner" width="105" />
 		<column label="Location" name="location" width="130" />
 		<column label="Time" name="time" width="100" />
-	</scroll_list>
+        <column label="Mono Time" name="mono_time" width="55" />
+    </scroll_list>
 	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
 	     left="10" name="id_text" width="100">
 		Object ID:
@@ -61,7 +62,10 @@
 	<string name="scripts_score_label">
 		Time
 	</string>
-	<string name="top_colliders_title">
+    <string name="scripts_mono_time_label">
+        Mono Time
+    </string>
+    <string name="top_colliders_title">
 		Top Colliders
 	</string>
 	<string name="top_colliders_text">
@@ -70,7 +74,7 @@
 	<string name="colliders_score_label">
 		Score
 	</string>
-	<string name="none_descriptor">
+    <string name="none_descriptor">
 		None found.
 	</string>
 </floater>
-- 
cgit v1.1