From 1a315c3bbf3edbe4528e47ed4ac83d468b1dde5c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 12 Jul 2011 20:36:05 -0700 Subject: Always return when an export fails --- linden/indra/newview/primbackup.cpp | 11 ++++++++--- .../skins/default/xui/en-us/floater_hardware_settings.xml | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp index 6d9d73f..9c3ab7f 100644 --- a/linden/indra/newview/primbackup.cpp +++ b/linden/indra/newview/primbackup.cpp @@ -472,6 +472,10 @@ void PrimBackup::exportWorker(void *userdata) llwarns << "Incorrect permission to export" << llendl; PrimBackup::getInstance()->mExportState = EXPORT_FAILED; LLSelectMgr::getInstance()->getSelection()->unref(); + gIdleCallbacks.deleteFunction(exportWorker); + LLNotifications::instance().add("ExportFailed"); + PrimBackup::getInstance()->close(); + return; } } break; @@ -581,10 +585,7 @@ void PrimBackup::exportWorker(void *userdata) break; case EXPORT_FAILED: - gIdleCallbacks.deleteFunction(exportWorker); llwarns << "Export process aborted." << llendl; - LLNotifications::instance().add("ExportFailed"); - PrimBackup::getInstance()->close(); break; } } @@ -682,6 +683,10 @@ LLSD PrimBackup::primsToLLSD(LLViewerObject::child_list_t child_list, bool is_at { llwarns << "Incorrect permission to export a sculpt texture." << llendl; PrimBackup::getInstance()->mExportState = EXPORT_FAILED; + gIdleCallbacks.deleteFunction(exportWorker); + LLNotifications::instance().add("ExportFailed"); + PrimBackup::getInstance()->close(); + return LLSD(); } } diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml index 24a895b..3309c11 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml @@ -40,7 +40,7 @@