livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Helper functions for access/ban lists are not really needed anymore - consolidate

master
PanteraPolnocy 2025-05-31 19:13:17 +02:00
parent 067bea25e0
commit 94e4ef77f4
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterland.cpp
View File

@ -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())

1
indra/newview/llfloaterland.h
View File

@ -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

10
indra/newview/llfloaterregioninfo.cpp
View File

@ -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())

1
indra/newview/llfloaterregioninfo.h
View File

@ -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