diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
| commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
| tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/llplugin/llpluginprocessparent.cpp | |
| parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llplugin/llpluginprocessparent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 71a6145b58..a4da7674d5 100644..100755 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -31,6 +31,7 @@ #include "llpluginprocessparent.h" #include "llpluginmessagepipe.h" #include "llpluginmessageclasses.h" +#include "llsdserialize.h" #include "stringize.h" #include "llapr.h" @@ -836,7 +837,7 @@ void LLPluginProcessParent::receiveMessageRaw(const std::string &message) LL_DEBUGS("Plugin") << "Received: " << message << LL_ENDL; LLPluginMessage parsed; - if(parsed.parse(message) != -1) + if(LLSDParser::PARSE_FAILURE != parsed.parse(message)) { if(parsed.hasValue("blocking_request")) { |