diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:48 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:48 -0700 |
| commit | c4992e30654775c54e3dc4fb583375ec079b23a4 (patch) | |
| tree | 31af4a671d5f0b238ffe99a141967bfc977cd69b /indra/llplugin/llpluginprocessparent.cpp | |
| parent | 88166e7d222bf18fc0324714dc44efef161bc409 (diff) | |
| parent | ea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff) | |
Merge from remote repo
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 5 |
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() |