From 94e4ef77f4f336cce3f9b64a8d69def95b54aa17 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 31 May 2025 19:13:17 +0200
Subject: [PATCH] Helper functions for access/ban lists are not really needed
 anymore - consolidate

---
 indra/newview/llfloaterland.cpp       | 10 +---------
 indra/newview/llfloaterland.h         |  1 -
 indra/newview/llfloaterregioninfo.cpp | 10 +---------
 indra/newview/llfloaterregioninfo.h   |  1 -
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 8c940f69e6..6a763bfc8b 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -3297,7 +3297,7 @@ void LLPanelLandAccess::onClickExportList(LLNameListCtrl* list, const std::strin
         LLNotificationsUtil::add("GenericAlert", args);
         return;
     }
-    exportList(list, filename);
+    LLFilePickerReplyThread::startPicker(boost::bind(&LLPanelLandAccess::exportListCallback, this, list, _1), LLFilePicker::FFSAVE_CSV, filename);
 }
 
 void LLPanelLandAccess::onClickExportAccess()
@@ -3310,14 +3310,6 @@ void LLPanelLandAccess::onClickExportBanned()
     onClickExportList(mListBanned, "land_banned_list.csv");
 }
 
-void LLPanelLandAccess::exportList(LLNameListCtrl* list, const std::string& default_filename)
-{
-    if (list)
-    {
-        LLFilePickerReplyThread::startPicker(boost::bind(&LLPanelLandAccess::exportListCallback, this, list, _1), LLFilePicker::FFSAVE_CSV, default_filename);
-    }
-}
-
 void LLPanelLandAccess::exportListCallback(LLNameListCtrl* list, const std::vector<std::string>& filenames)
 {
     if (filenames.empty())
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 92eeaa1e49..a5ba561908 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -409,7 +409,6 @@ public:
     void onClickExportAccess();
     void onClickExportBanned();
     void onClickExportList(LLNameListCtrl* list, const std::string& filename);
-    void exportList(LLNameListCtrl* list, const std::string& default_filename);
     void exportListCallback(LLNameListCtrl* list, const std::vector<std::string>& filenames);
     // </FS:PP> Ban and access lists export
 
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 538988b513..dc9bc22a90 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -4631,7 +4631,7 @@ void LLPanelEstateAccess::onClickExportList(LLNameListCtrl* list, const std::str
         LLNotificationsUtil::add("GenericAlert", args);
         return;
     }
-    exportList(list, filename);
+    LLFilePickerReplyThread::startPicker(boost::bind(&LLPanelEstateAccess::exportListCallback, this, list, _1), LLFilePicker::FFSAVE_CSV, filename);
 }
 
 void LLPanelEstateAccess::onClickExportEstateManagerList()
@@ -4654,14 +4654,6 @@ void LLPanelEstateAccess::onClickExportBannedList()
     onClickExportList(getChild<LLNameListCtrl>("banned_avatar_name_list"), "estate_banned_residents.csv");
 }
 
-void LLPanelEstateAccess::exportList(LLNameListCtrl* list, const std::string& default_filename)
-{
-    if (list)
-    {
-        LLFilePickerReplyThread::startPicker(boost::bind(&LLPanelEstateAccess::exportListCallback, this, list, _1), LLFilePicker::FFSAVE_CSV, default_filename);
-    }
-}
-
 void LLPanelEstateAccess::exportListCallback(LLNameListCtrl* list, const std::vector<std::string>& filenames)
 {
     if (filenames.empty())
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 676e56b9d7..ae3108172d 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -514,7 +514,6 @@ public:
     void onClickExportAllowedGroupList();
     void onClickExportBannedList();
     void onClickExportList(LLNameListCtrl* list, const std::string& filename);
-    void exportList(LLNameListCtrl* list, const std::string& default_filename);
     void exportListCallback(LLNameListCtrl* list, const std::vector<std::string>& filenames);
     // </FS:PP> Ban and access lists export