Backported LLSD changes from 1.22

5 files changed, 10 insertions, 9 deletions

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;