diff options
author | callum <none@none> | 2009-12-16 13:10:03 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-16 13:10:03 -0800 |
commit | 6cb3d25942bc2dc67f41efedb3a90db1b559b3b9 (patch) | |
tree | d304ba3f19039e96de47122c30cf384bb615a217 /indra/llplugin | |
parent | 4027788dfcbc7414d3d3cae5ef274906ad30f83d (diff) |
Merge with tip
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); } |