2 files changed, 9 insertions, 4 deletions

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 @@
     </combo_item>
   </combo_box>
         <spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
-             follows="left|top" height="16" increment="0.01"
+             follows="left|top" height="16" increment="0.01" tool_top="Disable basic shaders to set gamma" 
              initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
              min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"