diff options
author | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
commit | b215c724c1394e7c27a0309341ffc3b4f2154b25 (patch) | |
tree | c9a5eba93a0d333285bc2e87e15ed40e546f7d28 /indra/llplugin/llpluginprocessparent.cpp | |
parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
parent | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
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 315096d4fd..110fac0f23 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -927,6 +927,7 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) } // Send initial sleep time + llassert_always(mSleepTime != 0.f); setSleepTime(mSleepTime, true); setState(STATE_RUNNING); |