summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginmessagepipe.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
committerJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
commit9dd7924b19651abf393f7b0dee632904a6b8e52a (patch)
treeb22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/llplugin/llpluginmessagepipe.cpp
parent301f250c1cd77711c0234d8ed4089453712f834e (diff)
parent39fe664b97b946daf7984b946fede6f04ae731c4 (diff)
Merge
Diffstat (limited to 'indra/llplugin/llpluginmessagepipe.cpp')
-rw-r--r--indra/llplugin/llpluginmessagepipe.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginmessagepipe.cpp b/indra/llplugin/llpluginmessagepipe.cpp
index cc193fca42..1d7ddc5592 100644
--- a/indra/llplugin/llpluginmessagepipe.cpp
+++ b/indra/llplugin/llpluginmessagepipe.cpp
@@ -304,7 +304,14 @@ void LLPluginMessagePipe::processInput(void)
while((delim = mInput.find(MESSAGE_DELIMITER, start)) != std::string::npos)
{
// Let the owner process this message
- mOwner->receiveMessageRaw(mInput.substr(start, delim - start));
+ if (mOwner)
+ {
+ mOwner->receiveMessageRaw(mInput.substr(start, delim - start));
+ }
+ else
+ {
+ LL_WARNS("Plugin") << "!mOwner" << LL_ENDL;
+ }
start = delim + 1;
}