summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginprocessparent.cpp
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-10-28 16:53:45 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-10-28 16:53:45 +0200
commit726b00fd18107ef9aebf24b6d56ae8dcbb2003a6 (patch)
tree3030989a4c8a2c33991c0b19d001e925306add85 /indra/llplugin/llpluginprocessparent.cpp
parent0e4f48950be95430a1a6052cd41790d807c31216 (diff)
parent2663bad36b4b02003b4b4c5989c2571c71504cd7 (diff)
Merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
-rw-r--r--indra/llplugin/llpluginprocessparent.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index f3b4c6bdc6..39f9438fb3 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -55,6 +55,11 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner)
mBoundPort = 0;
mState = STATE_UNINITIALIZED;
mDisableTimeout = false;
+
+ // initialize timer - heartbeat test (mHeartbeat.hasExpired())
+ // can sometimes return true immediately otherwise and plugins
+ // fail immediately because it looks like
+ mHeartbeat.setTimerExpirySec(PLUGIN_LOCKED_UP_SECONDS);
}
LLPluginProcessParent::~LLPluginProcessParent()