diff options
| author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
| commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
| tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/viewer_components/updater | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
| parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/viewer_components/updater')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 1888f191e2..2e18218667 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -447,7 +447,7 @@ void LLUpdaterServiceImpl::restartTimer(unsigned int seconds) LL_INFOS("UpdaterService") << "will check for update again in " << seconds << " seconds" << LL_ENDL; mTimer.start(); - mTimer.setTimerExpirySec(seconds); + mTimer.setTimerExpirySec((F32)seconds); LLEventPumps::instance().obtain("mainloop").listen( sListenerName, boost::bind(&LLUpdaterServiceImpl::onMainLoop, this, _1)); } |