summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-11-18 13:25:44 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-11-18 13:25:44 -0800
commit3625a0f2362d2285d925052aedc69d27713e416d (patch)
tree8629528c4b2283ee876a939a3434367c7094494f /indra/viewer_components
parentcf3ded4491751231056b220525970e125d813e6a (diff)
inform user on failed install--needs proper user dialog ;-)
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/updater/llupdaterservice.cpp4
-rw-r--r--indra/viewer_components/updater/llupdaterservice.h3
2 files changed, 6 insertions, 1 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..3655136f3c 100644
--- a/indra/viewer_components/updater/llupdaterservice.h
+++ b/indra/viewer_components/updater/llupdaterservice.h
@@ -47,7 +47,8 @@ public:
enum UpdateEvent {
INVALID,
DOWNLOAD_COMPLETE,
- DOWNLOAD_ERROR
+ DOWNLOAD_ERROR,
+ INSTALL_ERROR
};
LLUpdaterService();