From 87978dc481b54b0b5528949e291c5fe06e5e10eb Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Fri, 25 Oct 2013 16:30:33 +0100 Subject: storm-1831 fixes for setKeywordsXml --- indra/newview/llsyntaxid.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index 442793bff1..4b7a420384 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -64,9 +64,12 @@ public: void result(const LLSD& content_ref) { //LLSyntaxIdLSL::setKeywordsXml(content_ref); - std::stringstream str; LLSDSerialize::toPrettyXML(content_ref, str); + + LLSD& xml = LLSD::emptyMap(); + LLSDSerialize::deserialize(xml, str, 10485760); + //LLSyntaxIdLSL::setKeywordsXml(xml); LL_WARNS("") << "fetchKeywordsFileResponder result:" << str.str() << "filename: '" << mFileSpec << "'" -- cgit v1.2.3 From bf2aad25f4db1564483f3450623775e53822346d Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Fri, 25 Oct 2013 19:29:06 +0100 Subject: cleaning out extra (commented) setKeywordsXml call --- indra/newview/llsyntaxid.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index 4b7a420384..b917134037 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -69,11 +69,10 @@ public: LLSD& xml = LLSD::emptyMap(); LLSDSerialize::deserialize(xml, str, 10485760); - //LLSyntaxIdLSL::setKeywordsXml(xml); LL_WARNS("") - << "fetchKeywordsFileResponder result:" << str.str() - << "filename: '" << mFileSpec << "'" - << LL_ENDL; + << "fetchKeywordsFileResponder result:" << str.str() + << "filename: '" << mFileSpec << "'" + << LL_ENDL; // TODO save the damn str to disc //llofstream file(mFileSpec, std::ios_base::out); -- cgit v1.2.3