diff options
| author | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
| commit | 773ce219c6317dc753369fa280d5d7f6c4b23550 (patch) | |
| tree | cbfc416e124efa20726d1db10a3324732cafb269 /indra/llplugin/llpluginprocessparent.cpp | |
| parent | f60314f22758daa22d096f2166367258d761d8b4 (diff) | |
| parent | 4767b546e6917ab4b2561553cf617d577fe998ff (diff) | |
merge
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() |