diff options
| author | richard <none@none> | 2009-10-27 11:19:03 -0700 |
|---|---|---|
| committer | richard <none@none> | 2009-10-27 11:19:03 -0700 |
| commit | afb9df7643443f62a154f93c0f3eb39dfc218a48 (patch) | |
| tree | 7c3a1c3eaccb33af933d0d642030160a7c513b36 /indra/llplugin/llpluginprocessparent.cpp | |
| parent | b4dd4a4d7777dccd8a5503c5e5736b57710cbfa7 (diff) | |
| parent | d4c3bf46ed6718ed1fa219d56436548edc6a2fa7 (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() |