diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 13:57:11 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 13:57:11 -0800 |
commit | d3ca545687945054c666359e78ada94949732205 (patch) | |
tree | 3751b2add8082693d4a6a1255fc0a46e1deacca3 /indra/llplugin/llpluginprocessparent.cpp | |
parent | 0d0e0852445444b9a129baf20f68d81488a1fa5e (diff) | |
parent | c50d86d37074b9908736050c7fca1196e7ef6ccc (diff) |
local merge
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
-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); } |