diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:55:01 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:55:01 -0500 |
commit | 36634bc1ec8d185b8b1d974b8bf215d3a413e242 (patch) | |
tree | 402b4c5ba9f70c960348c07021e32e25a3f8083b /indra/llplugin | |
parent | 6b065789c0f38256adb046a0231fe22d05d038da (diff) | |
parent | 74b36a4cf15593e32611f9848b3360605834d626 (diff) |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llplugin')
-rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index dab6d645dd..608e444375 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -62,6 +62,7 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner) // initialize timer - heartbeat test (mHeartbeat.hasExpired()) // can sometimes return true immediately otherwise and plugins // fail immediately because it looks like +// mHeartbeat.initClass(); mHeartbeat.setTimerExpirySec(PLUGIN_LOCKED_UP_SECONDS); } |