diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/llfloatertopobjects.cpp | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
| -rw-r--r-- | indra/newview/llfloatertopobjects.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 5ed50c0c2a..670541abe4 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -171,6 +171,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) std::string name_buf; std::string owner_buf; F32 mono_score = 0.f; + bool have_extended_data = false; msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block); msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block); @@ -182,7 +183,9 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, owner_buf, block); if(msg->getNumberOfBlocks("DataExtended")) { + have_extended_data = true; msg->getU32("DataExtended", "TimeStamp", time_stamp, block); + msg->getF32(_PREHASH_ReportData, "MonoScore", mono_score, block); } LLSD element; @@ -207,10 +210,9 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) element["columns"][3]["value"] = formatted_time((time_t)time_stamp); element["columns"][3]["font"] = "SANSSERIF"; - if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS) + if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS + && have_extended_data) { - // Not in the message template, needs to be checked against number of blocks - //msg->getF32Fast(_PREHASH_ReportData, "MonoScore", mono_score, block); element["columns"][4]["column"] = "Mono Time"; element["columns"][4]["value"] = llformat("%0.3f", mono_score); element["columns"][4]["font"] = "SANSSERIF"; |