diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
| commit | d3ec35fc6c2b8b47336650fe0570995201854a78 (patch) | |
| tree | f2113a1fa374fab76509f4462b2253b315584f65 /indra/viewer_components/updater/llupdaterservice.cpp | |
| parent | 4c3377a45abe3c8b2a0e376c62045a8f1260da08 (diff) | |
| parent | 19e0cc93a8af661dbac47552474a704ade600c74 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
| -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)); } |