diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
commit | b3e34545a4d37444a2def3462d75e185df5535d0 (patch) | |
tree | f4a09ef60040db8399528a7f3564b5d265b3e22a /indra/llplugin/llpluginprocessparent.cpp | |
parent | 7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff) | |
parent | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (diff) |
merge
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
-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 --- 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")) { |