From 6270e39990f5d05fbc6ec6f78f8273d932c56758 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 23 Jun 2018 02:32:06 +0200 Subject: [PATCH] Fix EOL --- indra/newview/daeexport.cpp | 4 ++-- indra/newview/fsfloaterexport.cpp | 4 ++-- indra/newview/llfloaterpreference.cpp | 14 +++++++------- indra/newview/llfloaterpreference.h | 2 +- indra/newview/llfloaterscriptedprefs.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index aadd2d09b2..7078c32daf 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -197,8 +197,8 @@ void ColladaExportFloater::updateUI() void ColladaExportFloater::onClickExport() { - (new LLFilePickerReplyThread(boost::bind(&ColladaExportFloater::onExportFileSelected, this, _1), - LLFilePicker::FFSAVE_COLLADA, LLDir::getScrubbedFileName(mObjectName + ".dae")))->getFile(); + (new LLFilePickerReplyThread(boost::bind(&ColladaExportFloater::onExportFileSelected, this, _1), + LLFilePicker::FFSAVE_COLLADA, LLDir::getScrubbedFileName(mObjectName + ".dae")))->getFile(); } void ColladaExportFloater::onExportFileSelected(const std::vector& filenames) diff --git a/indra/newview/fsfloaterexport.cpp b/indra/newview/fsfloaterexport.cpp index 0daf51d461..7ec3d0f649 100644 --- a/indra/newview/fsfloaterexport.cpp +++ b/indra/newview/fsfloaterexport.cpp @@ -1083,8 +1083,8 @@ void FSFloaterObjectExport::updateUI() void FSFloaterObjectExport::onClickExport() { - (new LLFilePickerReplyThread(boost::bind(&FSFloaterObjectExport::onExportFileSelected, this, _1), - LLFilePicker::FFSAVE_EXPORT, LLDir::getScrubbedFileName(mObjectName + ".oxp")))->getFile(); + (new LLFilePickerReplyThread(boost::bind(&FSFloaterObjectExport::onExportFileSelected, this, _1), + LLFilePicker::FFSAVE_EXPORT, LLDir::getScrubbedFileName(mObjectName + ".oxp")))->getFile(); } void FSFloaterObjectExport::onExportFileSelected(const std::vector& filenames) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 0c9d2c0491..7376adfce2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1721,12 +1721,12 @@ void LLFloaterPreference::onClickSetSoundCache() std::string cur_name(gSavedSettings.getString("FSSoundCacheLocation")); std::string proposed_name(cur_name); - (new LLDirPickerThread(boost::bind(&LLFloaterPreference::changeSoundCachePath, this, _1, _2), proposed_name))->getFile(); + (new LLDirPickerThread(boost::bind(&LLFloaterPreference::changeSoundCachePath, this, _1, _2), proposed_name))->getFile(); } void LLFloaterPreference::changeSoundCachePath(const std::vector& filenames, std::string proposed_name) { - std::string dir_name = filenames[0]; + std::string dir_name = filenames[0]; if (!dir_name.empty() && dir_name != proposed_name) { gSavedSettings.setString("FSSoundCacheLocation", dir_name); @@ -1830,12 +1830,12 @@ void LLFloaterPreference::setPreprocInclude() { std::string cur_name(gSavedSettings.getString("_NACL_PreProcHDDIncludeLocation")); std::string proposed_name(cur_name); - - (new LLDirPickerThread(boost::bind(&LLFloaterPreference::changePreprocIncludePath, this, _1, _2), proposed_name))->getFile(); + + (new LLDirPickerThread(boost::bind(&LLFloaterPreference::changePreprocIncludePath, this, _1, _2), proposed_name))->getFile(); } -void LLFloaterPreference::changePreprocIncludePath(const std::vector& filenames, std::string proposed_name) -{ +void LLFloaterPreference::changePreprocIncludePath(const std::vector& filenames, std::string proposed_name) +{ std::string dir_name = filenames[0]; if (!dir_name.empty() && dir_name != proposed_name) { @@ -4873,7 +4873,7 @@ BOOL FSPanelPreferenceBackup::postBuild() void FSPanelPreferenceBackup::onClickSetBackupSettingsPath() { std::string dir_name = gSavedSettings.getString("SettingsBackupPath"); - (new LLDirPickerThread(boost::bind(&FSPanelPreferenceBackup::changeBackupSettingsPath, this, _1, _2), dir_name))->getFile(); + (new LLDirPickerThread(boost::bind(&FSPanelPreferenceBackup::changeBackupSettingsPath, this, _1, _2), dir_name))->getFile(); } void FSPanelPreferenceBackup::changeBackupSettingsPath(const std::vector& filenames, std::string proposed_name) diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 63a31e385d..ec0f820ce0 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -197,7 +197,7 @@ public: // void onClickSetSounds(); // Handled centrally now void onClickPreviewUISound(const LLSD& ui_sound_id); // FIRE-8190: Preview function for "UI Sounds" Panel void setPreprocInclude(); - void changePreprocIncludePath(const std::vector& filenames, std::string proposed_name); + void changePreprocIncludePath(const std::vector& filenames, std::string proposed_name); void onClickEnablePopup(); void onClickDisablePopup(); void resetAllIgnored(); diff --git a/indra/newview/llfloaterscriptedprefs.cpp b/indra/newview/llfloaterscriptedprefs.cpp index 88db416a29..c7fc91a52e 100644 --- a/indra/newview/llfloaterscriptedprefs.cpp +++ b/indra/newview/llfloaterscriptedprefs.cpp @@ -92,8 +92,8 @@ void LLFloaterScriptEdPrefs::setPreprocInclude() { std::string cur_name(gSavedSettings.getString("_NACL_PreProcHDDIncludeLocation")); std::string proposed_name(cur_name); - - (new LLDirPickerThread(boost::bind(&LLFloaterScriptEdPrefs::changePreprocIncludePath, this, _1, _2), proposed_name))->getFile(); + + (new LLDirPickerThread(boost::bind(&LLFloaterScriptEdPrefs::changePreprocIncludePath, this, _1, _2), proposed_name))->getFile(); } void LLFloaterScriptEdPrefs::changePreprocIncludePath(const std::vector& filenames, std::string proposed_name)