diff options
| author | Richard Linden <none@none> | 2012-02-01 16:51:06 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-01 16:51:06 -0800 |
| commit | 174aa75799e608f951d3463f953c91968b868ef6 (patch) | |
| tree | 9edca14e09b986ec12c44cd2510a5099f0eda3ce /indra/viewer_components/updater/llupdaterservice.cpp | |
| parent | 7314ac3a37d624e6a750fc12df64d08b584ad593 (diff) | |
| parent | d32c1c28b4e2add4e51361d13356b6638c6f0817 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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)); } |