diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-07-21 16:47:59 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-07-21 22:42:36 +0300 |
| commit | baf6a330f51e9521625e265dafa4766cc9236a60 (patch) | |
| tree | 5229ad99552743ad9df93b8bf71601b754a20b80 | |
| parent | 4474d4f3fe115cec6b85dbb7f691da8d649fc258 (diff) | |
#6014 Update splash screen
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6a236e9b2e..0224f1613b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2058,7 +2058,7 @@ bool LLAppViewer::cleanup() } LLSplashScreen::show(); - LLSplashScreen::update(LLTrans::getString("ShuttingDown")); + LLSplashScreen::update(LLTrans::getString("ShutdownCleanup")); LL_INFOS() << "Cleaning up Keyboard & Joystick" << LL_ENDL; @@ -2160,7 +2160,9 @@ bool LLAppViewer::cleanup() SUBSYSTEM_CLEANUP(LLProxy); LLCore::LLHttp::cleanup(); + LLSplashScreen::update(LLTrans::getString("CompressingInventoryCache")); LLInventoryModel::waitForPendingCacheWrites(); + LLSplashScreen::update(LLTrans::getString("ShuttingDown")); ll_close_fail_log(); diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index e56db88cf9..9a1cc3b122 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2454,6 +2454,7 @@ void LLInventoryModel::cache( // Main thread is the only one modifying sPendingCacheThreads auto compress_cache = [temp_file, gzip_filename]() { + LL_PROFILE_ZONE_NAMED("inv cache compression"); LLTimer gzip_timer; if (gzip_file(temp_file, gzip_filename)) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e44a18ae79..ce86352643 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -206,6 +206,8 @@ If you feel this is an error, please contact support@secondlife.com</string> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> <string name="SavingSettings">Saving your settings...</string> <string name="LoggingOut">Logging out...</string> + <string name="CompressingInventoryCache">Compressing inventory cache...</string> + <string name="ShutdownCleanup">Releasing resources...</string> <string name="ShuttingDown">Shutting down...</string> <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string> <string name="SentToInvalidRegion">You were sent to an invalid region.</string> |