Merge remote-tracking branch 'imprudence/1.4-beta1.5' into next

Conflicts (merged manually):
	.gitignore
	linden/indra/newview/llgesturemgr.cpp
	linden/indra/newview/viewerinfo.cpp

1 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index e6288c6..fd20b7e 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -484,6 +484,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;
@@ -590,10 +594,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;
         }
 }
@@ -691,6 +692,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();
                         }
                 }