livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Backout rev 994c6639b393 DN-132 top scripts change - it was breaking name filtering

meow-7.2.2
Leyla Farazha 2010-11-10 14:45:54 -08:00
parent d7bca2b7b1 32704455db
commit e06472ff40
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llfloatertopobjects.cpp
View File

@ -147,17 +147,6 @@ void LLFloaterTopObjects::handle_land_reply(LLMessageSystem* msg, void** data)
}
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;
@ -182,7 +171,6 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
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);
@ -198,10 +186,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
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;
@ -252,16 +238,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
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);

5
indra/newview/llfloatertopobjects.h
View File

@ -29,11 +29,8 @@
#include "llfloater.h"
class LLAvatarName;
class LLUICtrl;
#include <boost/signals2.hpp> // boost::signals2::trackable
class LLFloaterTopObjects : public LLFloater
{
friend class LLFloaterReg;
@ -54,8 +51,6 @@ public:
static void setMode(U32 mode);
void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name, LLSD element);
private:
LLFloaterTopObjects(const LLSD& key);
~LLFloaterTopObjects();