merge support-featurettes-snapshot-merge-2 for QAR-754, includes:

    * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes

1 files changed, 13 insertions, 2 deletions

diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 93622ed94e..3c1b89d04b 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/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()
@@ -161,6 +164,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	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;
@@ -175,7 +179,11 @@ 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"))
+		{
+			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
+		}
+
 		LLSD element;
 
 		element["id"] = task_id;
@@ -193,7 +201,10 @@ 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";
+		
 		list->addElement(element);
 		
 		mObjectListData.append(element);