diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 16:47:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 16:47:01 -0500 |
| commit | 90640ed303184436ccac4d8a8da3588909bf4c3b (patch) | |
| tree | 9d7b8bcff30ed7e74e1b55cc23eb0837e4892bc4 /indra/newview/llfloatertopobjects.cpp | |
| parent | 9f6e4d907ec4781f1b82bb71e2028b39860e7df8 (diff) | |
| parent | 4e1c4a203d8ce6ed1cb662c8df1c5e053b7b4f3a (diff) | |
merge fix for STORM-577
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
| -rw-r--r-- | indra/newview/llfloatertopobjects.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 2aaf403d5f..e5c4547226 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -147,6 +147,17 @@ 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; @@ -171,6 +182,7 @@ 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); @@ -186,8 +198,10 @@ 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; @@ -238,8 +252,16 @@ 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); |