leyla_linden avatar leyla_linden committed 994c663

DN-132 Top scripts now show complete names

Comments (0)

Files changed (2)

indra/newview/llfloatertopobjects.cpp

 
 }
 
+void LLFloaterTopObjects::onAvatarNameCache(const LLUUID& agent_id,
+									   const LLAvatarName& av_name,
+									   LLSD element)
+{	
+	LLScrollListCtrl *list = getChild<LLScrollListCtrl>("objects_list");
+
+	element["columns"][2]["value"] = av_name.getCompleteName();
+
+	list->addElement(element);
+}
+
 void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 {
 	U32 request_flags;
 		F32 mono_score = 0.f;
 		bool have_extended_data = false;
 		S32 public_urls = 0;
+		LLUUID owner_id;
 
 		msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
 		msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
 			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
 			msg->getF32("DataExtended", "MonoScore", mono_score, block);
 			msg->getS32(_PREHASH_ReportData,"PublicURLs",public_urls,block);
+			msg->getUUID("DataExtended","OwnerID",owner_id,block);
 		}
 
+
 		LLSD element;
 
 		element["id"] = task_id;
 			columns[6]["font"] = "SANSSERIF";
 		}
 		element["columns"] = columns;
-		list->addElement(element);
 		
+		if (!owner_id.isNull())
+		{
+			LLAvatarNameCache::get(owner_id, boost::bind(&LLFloaterTopObjects::onAvatarNameCache, this, _1, _2, element));
+		}
+		else
+		{
+			list->addElement(element);
+		}
+
 		mObjectListData.append(element);
 		mObjectListIDs.push_back(task_id);
 

indra/newview/llfloatertopobjects.h

 
 #include "llfloater.h"
 
+class LLAvatarName;
 class LLUICtrl;
 
+#include <boost/signals2.hpp>	// boost::signals2::trackable
+
 class LLFloaterTopObjects : public LLFloater
 {
 	friend class LLFloaterReg;
 
 	static void setMode(U32 mode);
 
+	void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name, LLSD element);
+
 private:
 	LLFloaterTopObjects(const LLSD& key);
 	~LLFloaterTopObjects();
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.