diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
| commit | 3e95634aaf89a5ecd12d7e08d96679cbb3d1bba8 (patch) | |
| tree | 117222bf666e577e517bdec4f99bf6a5f0d66ab3 /indra/viewer_components/updater/llupdaterservice.cpp | |
| parent | 35fc90e8aaebc10a5a01c58247c29c8103220578 (diff) | |
| parent | f47c42bb10cd3291ce966be7b209b422646dff19 (diff) | |
merge
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 6cc872f2ca..a1ad3e3381 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -378,7 +378,19 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event) { mTimer.stop(); LLEventPumps::instance().obtain("mainloop").stopListening(sListenerName); - mUpdateChecker.check(mProtocolVersion, mUrl, mPath, mChannel, mVersion); + + // Check for failed install. + if(LLFile::isfile(ll_install_failed_marker_path())) + { + // TODO: notify the user. + llinfos << "found marker " << ll_install_failed_marker_path() << llendl; + llinfos << "last install attempt failed" << llendl; + LLFile::remove(ll_install_failed_marker_path()); + } + else + { + mUpdateChecker.check(mProtocolVersion, mUrl, mPath, mChannel, mVersion); + } } else { |