diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-18 15:40:36 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-18 15:40:36 -0800 |
| commit | cd30239eda5d8969db02c2c56d95332dd5039bb0 (patch) | |
| tree | 54f49de82bfde61bd9520aef057abab8ea6a7f8f /indra/viewer_components/updater | |
| parent | 0e52564f0a36365c2ce5f5263d15778394741fde (diff) | |
| parent | 86e84a1313f9fcb78b3e6b490dcf1604829ef175 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra/viewer_components/updater')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 4 | ||||
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 58f2c7da76..b49f6d04b0 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -408,6 +408,10 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event) llinfos << "found marker " << ll_install_failed_marker_path() << llendl; llinfos << "last install attempt failed" << llendl; LLFile::remove(ll_install_failed_marker_path()); + + LLSD event; + event["type"] = LLSD(LLUpdaterService::INSTALL_ERROR); + LLEventPumps::instance().obtain(LLUpdaterService::pumpName()).post(event); } else { diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h index 8d0b95be86..55824af188 100644 --- a/indra/viewer_components/updater/llupdaterservice.h +++ b/indra/viewer_components/updater/llupdaterservice.h @@ -44,10 +44,11 @@ public: static std::string const & pumpName(void); // Type codes for events posted by this service. Stored the event's 'type' element. - enum UpdateEvent { + enum eUpdateEvent { INVALID, DOWNLOAD_COMPLETE, - DOWNLOAD_ERROR + DOWNLOAD_ERROR, + INSTALL_ERROR }; LLUpdaterService(); |