diff options
author | Richard Linden <none@none> | 2011-08-09 16:14:55 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-08-09 16:14:55 -0700 |
commit | 802a063a878a145904d152bed98ac55e7cfecb42 (patch) | |
tree | 10052a06cb71be011745e6940a9e3c26ccb66633 /indra/llplugin/llpluginprocessparent.cpp | |
parent | 1d675841717f664a46e9963b6c51cf77b0678ecf (diff) | |
parent | 70a872c4a2d27c8f3e85f30c3741db8d36061b9b (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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); |