diff options
| author | callum <none@none> | 2009-10-26 17:12:35 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-26 17:12:35 -0700 |
| commit | b7d446a3e9af768b62f321bfba36f36379d5acc0 (patch) | |
| tree | 31f8a04042fbba80e92db058c98d1c6e92d61ad9 | |
| parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) | |
Potential fix for https://jira.lindenlab.com/jira/browse/DEV-41702
and https://jira.lindenlab.com/jira/browse/DEV-38579. Both relate to
media not working properly and were likely caused by an uninitialized
heartbeat timeout.
| -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() |