aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterregioninfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterregioninfo.cpp')
-rw-r--r--linden/indra/newview/llfloaterregioninfo.cpp3
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)
542{ 542{
543 const std::string* xml_alert = (std::string*)data; 543 const std::string* xml_alert = (std::string*)data;
544 gViewerWindow->alertXml(*xml_alert); 544 gViewerWindow->alertXml(*xml_alert);
545 delete xml_alert;
546} 545}
547 546
548///////////////////////////////////////////////////////////////////////////// 547/////////////////////////////////////////////////////////////////////////////
@@ -1306,6 +1305,7 @@ void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
1306 return; 1305 return;
1307 } 1306 }
1308 std::string filepath = picker.getFirstFile(); 1307 std::string filepath = picker.getFirstFile();
1308 gXferManager->expectFileForRequest(filepath);
1309 1309
1310 LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data; 1310 LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
1311 strings_t strings; 1311 strings_t strings;
@@ -1325,6 +1325,7 @@ void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
1325 return; 1325 return;
1326 } 1326 }
1327 std::string filepath = picker.getFirstFile(); 1327 std::string filepath = picker.getFirstFile();
1328 gXferManager->expectFileForTransfer(filepath);
1328 1329
1329 LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data; 1330 LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
1330 strings_t strings; 1331 strings_t strings;