Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index ffd7d48..8a4f621 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -542,7 +542,6 @@ void LLPanelRegionInfo::onClickHelp(void* data)
 {
         const std::string* xml_alert = (std::string*)data;
         gViewerWindow->alertXml(*xml_alert);
-        delete xml_alert;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1306,6 +1305,7 @@ void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
                 return;
         }
         std::string filepath = picker.getFirstFile();
+        gXferManager->expectFileForRequest(filepath);
 
         LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
         strings_t strings;
@@ -1325,6 +1325,7 @@ void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
                 return;
         }
         std::string filepath = picker.getFirstFile();
+        gXferManager->expectFileForTransfer(filepath);
 
         LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
         strings_t strings;