summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/llupdaterservice.cpp
diff options
context:
space:
mode:
authorprep <none@none>2012-03-13 15:48:24 -0400
committerprep <none@none>2012-03-13 15:48:24 -0400
commitfab57eea612f34ed9d8c8559674ead1760aab42b (patch)
tree51394d44e1b89bb75d168464aec539f60f44f8cd /indra/viewer_components/updater/llupdaterservice.cpp
parent87b414c4934d0d52eef0b323245568bb1e95ec70 (diff)
parent00717147d2b832fa3239267edf409f0a1dfcd9fd (diff)
pull and merge from viewer-development
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
-rw-r--r--indra/viewer_components/updater/llupdaterservice.cpp2
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));
}