From 69a31fad4caabec61e4a5e4094de63620ab4da66 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 27 Nov 2022 23:01:42 +0000
Subject: [PATCH 1/2] [FIRE-32453] [BUG-232971] disconnect sooner to force the
 cache write

The call to forceQuit sets the viewer state to Quitting. This triggers all the thread pools to exit, and to do so with no sense of orderly closure.
As a result the main window can exit which removes any visual indication to the user that work is still happening.
When the user then restarts, issues are caused because of temporary files that may still be in use.
It is possible too that the early closure of the mainwindow, allows the OS to terminate the process without prompting the user for a safe shutdown (unproven)
---
 indra/newview/llappviewer.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3ed2ed83dd..8a35750407 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2057,12 +2057,12 @@ bool LLAppViewer::cleanup()
 
     // Give any remaining SLPlugin instances a chance to exit cleanly.
     LLPluginProcessParent::shutdown();
+	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
+	// disconnectViewer();
+	// LLViewerCamera::deleteSingleton();
 
-	disconnectViewer();
-	LLViewerCamera::deleteSingleton();
-
-	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
-	
+	// LL_INFOS() << "Viewer disconnected" << LL_ENDL;
+	// </FS:Beq>
 	if (gKeyboard)
 	{
 		gKeyboard->resetKeys();
@@ -4864,6 +4864,11 @@ void LLAppViewer::removeDumpDir()
 
 void LLAppViewer::forceQuit()
 {
+	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
+	disconnectViewer();
+	LLViewerCamera::deleteSingleton();
+	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
+	// </FS:Beq>
 	LLApp::setQuitting();
 }
 
@@ -6334,7 +6339,12 @@ void LLAppViewer::idleNetwork()
 		}
 	}
 	add(LLStatViewer::NUM_NEW_OBJECTS, gObjectList.mNumNewObjects);
-
+	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
+	if(gDisconnected)
+	{
+		return;
+	}
+	// </FS:Beq>
 	// Retransmit unacknowledged packets.
 	gXferManager->retransmitUnackedPackets();
 	gAssetStorage->checkForTimeouts();
@@ -6363,6 +6373,7 @@ void LLAppViewer::disconnectViewer()
 	{
 		return;
 	}
+	gDisconnected = TRUE;// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
 	//
 	// Cleanup after quitting.
 	//
@@ -6445,7 +6456,7 @@ void LLAppViewer::disconnectViewer()
 	LLDestroyClassList::instance().fireCallbacks();
 
 	cleanup_xfer_manager();
-	gDisconnected = TRUE;
+	// gDisconnected = TRUE; // <FS:Beq/> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
 
 	// Pass the connection state to LLUrlEntryParcel not to attempt
 	// parcel info requests while disconnected.

From de0dd5a11b5eeceb8038c995e9c6a6264e7f12ff Mon Sep 17 00:00:00 2001
From: Pantera <panterapolnocy@gmail.com>
Date: Mon, 28 Nov 2022 09:33:46 +0100
Subject: [PATCH 2/2] FIRE-32474 Russian translation update, by Romka
 Swallowtail

---
 indra/newview/skins/default/xui/ru/menu_viewer.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index af7c365d84..8395a1618c 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -562,7 +562,10 @@
 			<menu_item_call label="Отключить журнал сообщений" name="Disable Message Log"/>
 			<menu_item_check label="Скорость интерполяции объектов" name="Velocity Interpolate Objects"/>
 			<menu_item_check label="Время ответа интерполяции позиции объекта" name="Ping Interpolate Object Positions"/>
-			<menu_item_call label="Снижение пакета" name="Drop a Packet"/>
+			<menu_item_call label="Сбросить пакет" name="Drop a Packet"/>
+		</menu>
+		<menu label="Кэш" name="Cache">
+			<menu_item_call label="Очистить кэш диска" name="Purge Disk Cache"/>
 		</menu>
 		<menu_item_call label="Дамп камеры со скриптами" name="Dump Scripted Camera"/>
 		<menu label="Запись" name="Recorder">