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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Ansariel 2022-12-02 13:02:42 +01:00
parent a7d55b4e77 de0dd5a11b
commit f1443cd88e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llappviewer.cpp
View File

@ -2062,12 +2062,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();
@ -4869,6 +4869,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();
}
@ -6339,7 +6344,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();
@ -6368,6 +6378,7 @@ void LLAppViewer::disconnectViewer()
{
return;
}
gDisconnected = TRUE;// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
//
// Cleanup after quitting.
//
@ -6450,7 +6461,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.

5
indra/newview/skins/default/xui/ru/menu_viewer.xml
View File

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