From 00716781a30de3eb57dc36d2128b0afd56571c99 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 16 Feb 2009 11:48:17 -0700 Subject: Backported Top Scripts changes from 1.22 --- linden/indra/newview/llfloatertopobjects.cpp | 6 ++++-- .../newview/skins/default/xui/en-us/floater_top_objects.xml | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp index ada5c68..0afa618 100644 --- a/linden/indra/newview/llfloatertopobjects.cpp +++ b/linden/indra/newview/llfloatertopobjects.cpp @@ -180,7 +180,7 @@ 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")) + if(msg->has("DataExtended")) { have_extended_data = true; msg->getU32("DataExtended", "TimeStamp", time_stamp, block); @@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS && have_extended_data) { - element["columns"][5]["column"] = "Mono Time"; + element["columns"][5]["column"] = "mono_time"; element["columns"][5]["value"] = llformat("%0.3f", mono_score); element["columns"][5]["font"] = "SANSSERIF"; } @@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) { setTitle(getString("top_scripts_title")); list->setColumnLabel("score", getString("scripts_score_label")); + list->setColumnLabel("mono_time", getString("scripts_mono_time_label")); LLUIString format = getString("top_scripts_text"); format.setArg("[COUNT]", llformat("%d", total_count)); @@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) { setTitle(getString("top_colliders_title")); list->setColumnLabel("score", getString("colliders_score_label")); + list->setColumnLabel("mono_time", ""); LLUIString format = getString("top_colliders_text"); format.setArg("[COUNT]", llformat("%d", total_count)); childSetValue("title_text", LLSD(format)); diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml index 96f48eb..1b60510 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml @@ -14,7 +14,8 @@ - + + Object ID: @@ -61,7 +62,10 @@ Time - + + Mono Time + + Top Colliders @@ -70,7 +74,7 @@ Score - + None found. -- cgit v1.1 From 30b9fd9f0fe44b820d51a47c9aab135127b82b59 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 17 Feb 2009 22:02:45 -0700 Subject: Backported LLSD changes from 1.22 --- ChangeLog.txt | 25 +++++++++++++++++++++---- linden/indra/llcommon/llsdserialize.cpp | 2 +- linden/indra/llcommon/llsdserialize_xml.cpp | 13 ++++++------- linden/indra/llmessage/message_prehash.cpp | 1 + linden/indra/llmessage/message_prehash.h | 1 + linden/indra/newview/llfloatertopobjects.cpp | 2 +- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 028e4bb..3d8166f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,8 +1,18 @@ -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -=- 1.1.0 RC1 -= -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +2009-02-15 McCabe Maxsted + + * linden/indra/llcommon/llsdserialize.cpp: + Backported LLSD changes. + * linden/indra/llcommon/llsdserialize_xml.cpp: + Ditto. + + * linden/indra/llmessage/message_prehash.cpp: + Added MonoScore to message_prehash. + * linden/indra/llmessage/message_prehash.h: + Ditto. + * linden/indra/newview/llfloatertopobjects.cpp: + Ditto. + -======= 2009-02-14 McCabe Maxsted * linden/indra/newview/app_settings/settings.xml: @@ -61,6 +71,13 @@ * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc: Ditto. +2009-02-12 McCabe Maxsted + + * linden/indra/newview/llfloatertopobjects.cpp: + Backported Top Objects changes from 1.22. + * linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml: + Ditto. + 2009-02-04 McCabe Maxsted diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp index d42842d..f21ff68 100644 --- a/linden/indra/llcommon/llsdserialize.cpp +++ b/linden/indra/llcommon/llsdserialize.cpp @@ -324,7 +324,7 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes) S32 LLSDParser::parseLines(std::istream& istr, LLSD& data) { mCheckLimits = false; - mParseLines = false; // was true, Emergency fix DEV-17785 parsing newline failure + mParseLines = true; return doParse(istr, data); } diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp index 690ab67..9c3f85e 100644 --- a/linden/indra/llcommon/llsdserialize_xml.cpp +++ b/linden/indra/llcommon/llsdserialize_xml.cpp @@ -461,11 +461,11 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data) input.clear(); } - // Don't parse the NULL at the end which might be added if \n was absorbed by getline() + // Re-insert with the \n that was absorbed by getline() char * text = (char *) buffer; if ( text[num_read - 1] == 0) { - num_read--; + text[num_read - 1] = '\n'; } } @@ -808,12 +808,11 @@ void LLSDXMLParser::parsePart(const char *buf, int len) // virtual S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const { -// Remove code - emergency fix DEV-17785 parsing newline failure -// if (mParseLines) -// { + if (mParseLines) + { // Use line-based reading (faster code) -// return impl.parseLines(input, data); -// } + return impl.parseLines(input, data); + } return impl.parse(input, data); } diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp index 2ac1319..fd8953d 100644 --- a/linden/indra/llmessage/message_prehash.cpp +++ b/linden/indra/llmessage/message_prehash.cpp @@ -598,6 +598,7 @@ char* _PREHASH_FromAgentId = LLMessageStringTable::getInstance()->getString("Fro char* _PREHASH_Type = LLMessageStringTable::getInstance()->getString("Type"); char* _PREHASH_ChatType = LLMessageStringTable::getInstance()->getString("ChatType"); char* _PREHASH_ReportData = LLMessageStringTable::getInstance()->getString("ReportData"); +char* _PREHASH_MonoScore = LLMessageStringTable::getInstance()->getString("MonoScore"); char* _PREHASH_RequestBlock = LLMessageStringTable::getInstance()->getString("RequestBlock"); char* _PREHASH_GrantData = LLMessageStringTable::getInstance()->getString("GrantData"); char* _PREHASH_DetachAttachmentIntoInv = LLMessageStringTable::getInstance()->getString("DetachAttachmentIntoInv"); diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h index 0ee02be..8b8c857 100644 --- a/linden/indra/llmessage/message_prehash.h +++ b/linden/indra/llmessage/message_prehash.h @@ -598,6 +598,7 @@ extern char * _PREHASH_FromAgentId; extern char * _PREHASH_Type; extern char * _PREHASH_ChatType; extern char * _PREHASH_ReportData; +extern char * _PREHASH_MonoScore; extern char * _PREHASH_RequestBlock; extern char * _PREHASH_GrantData; extern char * _PREHASH_DetachAttachmentIntoInv; diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp index 0afa618..e4c90f0 100644 --- a/linden/indra/newview/llfloatertopobjects.cpp +++ b/linden/indra/newview/llfloatertopobjects.cpp @@ -184,7 +184,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) { have_extended_data = true; msg->getU32("DataExtended", "TimeStamp", time_stamp, block); - msg->getF32(_PREHASH_ReportData, "MonoScore", mono_score, block); + msg->getF32("DataExtended", "MonoScore", mono_score, block); } LLSD element; -- cgit v1.1 From dedd02010126a481ea1edad6ed618e10023c7f53 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 18 Feb 2009 01:18:14 -0700 Subject: Fixed crash in Top Scripts --- ChangeLog.txt | 6 ++++++ linden/indra/llmessage/llpumpio.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3d8166f..c2c4669 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-02-17 McCabe Maxsted + + * linden/indra/llmessage/llpumpio.cpp: + Fixed crash in Top Scripts. + + 2009-02-15 McCabe Maxsted * linden/indra/llcommon/llsdserialize.cpp: diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp index 9ce0bab..467502b 100644 --- a/linden/indra/llmessage/llpumpio.cpp +++ b/linden/indra/llmessage/llpumpio.cpp @@ -177,7 +177,8 @@ LLPumpIO::LLPumpIO(apr_pool_t* pool) : mCurrentPool(NULL), mCurrentPoolReallocCount(0), mChainsMutex(NULL), - mCallbackMutex(NULL) + mCallbackMutex(NULL), + mCurrentChain(mRunningChains.end()) { LLMemType m1(LLMemType::MTYPE_IO_PUMP); initialize(pool); @@ -273,7 +274,10 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout) void LLPumpIO::adjustTimeoutSeconds(F32 delta) { // If no chain is running, bail - if(current_chain_t() == mCurrentChain) return; + if(mRunningChains.end() == mCurrentChain) + { + return; + } (*mCurrentChain).adjustTimeoutSeconds(delta); } -- cgit v1.1