From b9c60817bbd4e5f293236dc8133c7bf5d3f264c1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 Oct 2023 14:47:20 -0400 Subject: DRTVWR-589: Clean up from merge from updated main. --- indra/newview/llviewermenufile.cpp | 14 -------------- indra/newview/llviewermenufile.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 15088244f9..17e89e1850 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -741,20 +741,6 @@ class LLFileEnableCloseAllWindows : public view_listener_t } }; -void close_all_windows() -{ - bool app_quitting = false; - gFloaterView->closeAllChildren(app_quitting); - LLFloaterSnapshot *floater_snapshot = LLFloaterSnapshot::findInstance(); - if (floater_snapshot) - floater_snapshot->closeFloater(app_quitting); - LLFloaterSimpleOutfitSnapshot *floater_outfit_snapshot = LLFloaterSimpleOutfitSnapshot::findInstance(); - if (floater_outfit_snapshot) - floater_outfit_snapshot->closeFloater(app_quitting); - if (gMenuHolder) - gMenuHolder->hideMenus(); -} - class LLFileCloseAllWindows : public view_listener_t { bool handleEvent(const LLSD& userdata) diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index fd13eef8b7..61572b9996 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -72,8 +72,6 @@ void assign_defaults_and_show_upload_message( const std::string& display_name, std::string& description); -void close_all_windows(); - //consider moving all file pickers below to more suitable place class LLFilePickerThread : public LLThread { //multi-threaded file picker (runs system specific file picker in background and calls "notify" from main thread) -- cgit v1.2.3