summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginmessagepipe.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:50:42 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:50:42 +0000
commit83b74ef511ac49b02465ece9c35fc80066de729d (patch)
treebcfee65c60b9868ab4d1f5cb7a35b112c15c96b9 /indra/llplugin/llpluginmessagepipe.cpp
parent56d43b9c79ede83c563c4d6d1f60ea831926e1ac (diff)
parentbac0248f3b9a2594a3612cf33a246b3e61f89aca (diff)
merge from viewer2 trunk.
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;
}