From 9dee543ea354725260f5d0882d861a801e9a7da2 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 30 Aug 2021 10:03:56 +0200 Subject: [PATCH 1/7] Revert "Simple cache viewer: Enable some cache purge log output for testing" This reverts commit ad952d67443e586f162a9c1ce17858a2e8b01b4d. Iterate over the cache directory one time instead of three. --- indra/llfilesystem/lldiskcache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index e126a24c00..37041154d6 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -71,7 +71,7 @@ LLDiskCache::LLDiskCache(const std::string cache_dir, void LLDiskCache::purge() { - //if (mEnableCacheDebugInfo) + if (mEnableCacheDebugInfo) { LL_INFOS() << "Total dir size before purge is " << dirFileSize(mCacheDir) << LL_ENDL; } @@ -181,7 +181,7 @@ void LLDiskCache::purge() } } - //if (mEnableCacheDebugInfo) + if (mEnableCacheDebugInfo) { auto end_time = std::chrono::high_resolution_clock::now(); auto execute_time = std::chrono::duration_cast(end_time - start_time).count(); From ac70e21c93f05e1e24e5ddc10ace2a0b4e1a76ae Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 30 Aug 2021 13:59:36 +0200 Subject: [PATCH 2/7] More boost::filesystem failure checks --- indra/llfilesystem/lldiskcache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index 37041154d6..589213733a 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -93,7 +93,7 @@ void LLDiskCache::purge() //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(cache_path, ec), {})) for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(cache_path, ec), {})) { - if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()) + if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())) { if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos) { @@ -485,7 +485,7 @@ uintmax_t LLDiskCache::dirFileSize(const std::string dir) //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(dir_path, ec), {})) for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(dir_path, ec), {})) { - if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()) + if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())) { if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos) { From 07fb63a528d02b13064ac82099fa28c21aed8d89 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 31 Aug 2021 14:44:39 +0200 Subject: [PATCH 3/7] OSX; KDU 8.2 --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3f6859e867..f14d924f1c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1932,9 +1932,9 @@ archive hash - 3b8b0f54c851f136e2a92e1c6ba724a5 + e99b86fc3ed48a778580dd1449f8f33b url - file:///opt/firestorm/kdu-8.1-darwin64-211970151.tar.bz2 + file:///opt/firestorm/kdu-8.2-darwin-212431232.tar.bz2 name darwin64 From 01d644f95f0ed35e0f360a0a3aaa2366e46160de Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 2 Sep 2021 19:36:36 +0200 Subject: [PATCH 4/7] Splash page is https ready thanks to BUG-216465 being fixed --- indra/newview/app_settings/grids.xml | 4 ++-- indra/newview/app_settings/settings.xml | 2 +- indra/newview/fsgridhandler.cpp | 2 +- indra/newview/llviewernetwork.cpp | 2 +- indra/newview/skins/default/xui/en/panel_fs_login.xml | 2 +- indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml | 2 +- indra/newview/skins/latency/xui/en/panel_fs_login.xml | 2 +- indra/newview/skins/starlight/xui/en/panel_fs_login.xml | 2 +- indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/indra/newview/app_settings/grids.xml b/indra/newview/app_settings/grids.xml index 6541975346..2a2e599f07 100644 --- a/indra/newview/app_settings/grids.xml +++ b/indra/newview/app_settings/grids.xml @@ -953,7 +953,7 @@ agent loginpage - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ loginuri https://login.aditi.lindenlab.com/cgi-bin/login.cgi @@ -986,7 +986,7 @@ agent loginpage - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ loginuri https://login.agni.lindenlab.com/cgi-bin/login.cgi diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 90dfad49fb..658df3f703 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24235,7 +24235,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type String Value - http://phoenixviewer.com/app/loginV3/secondlifegrid.xml + https://phoenixviewer.com/app/loginV3/secondlifegrid.xml FSIgnoreAdHocSessions diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index aa5e69fa5b..462b10ca41 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -149,7 +149,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry* } } -const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/"; +const char* DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/"; const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/"; diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 3daf2621a5..8681cc89ee 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -62,7 +62,7 @@ const std::string GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types"; const std::string GRID_SLURL_BASE = "slurl_base"; const std::string GRID_APP_SLURL_BASE = "app_slurl_base"; -const std::string DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/"; +const std::string DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi"; diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml index 0446aa2e42..c2238b34dc 100644 --- a/indra/newview/skins/default/xui/en/panel_fs_login.xml +++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml @@ -12,7 +12,7 @@ width="1024"> - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ http://secondlife.eniac15.lindenlab.com/reg-in-client/ diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml index ac6ce3dbfa..3ae12cfa6b 100644 --- a/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml @@ -1,7 +1,7 @@ - Zdjęcie stroju: "[OUTFIT_NAME]" + Zdjecie stroju: "[OUTFIT_NAME]" Nie ma jeszcze żadnych strojów. Spróbuj [secondlife:///app/search/all/ Wyszukiwarki] diff --git a/indra/newview/skins/latency/xui/en/panel_fs_login.xml b/indra/newview/skins/latency/xui/en/panel_fs_login.xml index 4401f7dbea..308958fa7f 100644 --- a/indra/newview/skins/latency/xui/en/panel_fs_login.xml +++ b/indra/newview/skins/latency/xui/en/panel_fs_login.xml @@ -15,7 +15,7 @@ name="real_url" translate="false" > - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ http://secondlife.eniac15.lindenlab.com/reg-in-client/ diff --git a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml index f784d516c6..56548b44e5 100644 --- a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml +++ b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml @@ -12,7 +12,7 @@ width="1024"> - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ http://secondlife.eniac15.lindenlab.com/reg-in-client/ From 035befac70a888062e82278ac349adfd8fb1c15f Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 12 Sep 2021 01:24:08 +0200 Subject: [PATCH 5/7] Linux; Update CEF. --- autobuild.xml | 4 ++-- indra/media_plugins/cef/media_plugin_cef.cpp | 2 -- indra/newview/viewer_manifest.py | 14 ++++---------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f14d924f1c..45a139ee7f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - 2b29e6435ea9487bc2019a28b8287d6a + c183575032398b5750d41b69f1b875ff url - http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2 + http://3p.firestormviewer.org/dullahan-1.12.2.202109112139_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212541938.tar.bz2 name linux64 diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index bbd3c85ec1..647e3dec38 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -533,9 +533,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnCursorChangedCallback(std::bind(&MediaPluginCEF::onCursorChangedCallback, this, std::placeholders::_1)); mCEFLib->setOnRequestExitCallback(std::bind(&MediaPluginCEF::onRequestExitCallback, this)); mCEFLib->setOnJSDialogCallback(std::bind(&MediaPluginCEF::onJSDialogCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); -#ifndef LL_LINUX mCEFLib->setOnJSBeforeUnloadCallback(std::bind(&MediaPluginCEF::onJSBeforeUnloadCallback, this)); -#endif dullahan::dullahan_settings settings; #if LL_WINDOWS diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0bb50ace7a..bbdf6007f6 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1917,18 +1917,12 @@ class LinuxManifest(ViewerManifest): self.path( "v8_context_snapshot.bin" ) with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="bin"): - self.path( "cef.pak" ) - self.path( "cef_extensions.pak" ) - self.path( "cef_100_percent.pak" ) - self.path( "cef_200_percent.pak" ) - self.path( "devtools_resources.pak" ) + self.path( "chrome_100_percent.pak" ) + self.path( "chrome_200_percent.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"): - self.path( "cef.pak" ) - self.path( "cef_extensions.pak" ) - self.path( "cef_100_percent.pak" ) - self.path( "cef_200_percent.pak" ) - self.path( "devtools_resources.pak" ) + self.path( "chrome_100_percent.pak" ) + self.path( "chrome_200_percent.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')): From e0b757068522d4f589f8a1a16be167773128a8e9 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 13 Sep 2021 13:11:56 +0200 Subject: [PATCH 6/7] Linx, Update CEF once more, tweak packaging. --- autobuild.xml | 4 ++-- indra/newview/viewer_manifest.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 45a139ee7f..963dd22556 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - c183575032398b5750d41b69f1b875ff + 7b8fd7a8ea9850f1cad187059d2da4af url - http://3p.firestormviewer.org/dullahan-1.12.2.202109112139_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212541938.tar.bz2 + http://3p.firestormviewer.org/dullahan-1.12.2.202109131147_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212560947.tar.bz2 name linux64 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bbdf6007f6..7fa53f1ace 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1902,7 +1902,7 @@ class LinuxManifest(ViewerManifest): with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ): self.path( "*.so" ) - with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("lib", "swiftshader") ): + with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst="lib" ): self.path( "*.so" ) with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"): @@ -1919,10 +1919,12 @@ class LinuxManifest(ViewerManifest): with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="bin"): self.path( "chrome_100_percent.pak" ) self.path( "chrome_200_percent.pak" ) + self.path( "resources.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"): self.path( "chrome_100_percent.pak" ) self.path( "chrome_200_percent.pak" ) + self.path( "resources.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')): From 36439c9f13511782408877800694d9661501a9c2 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 15 Sep 2021 11:47:00 +0200 Subject: [PATCH 7/7] Use dynamic cast as a test id that fixes random TP crashes. --- indra/newview/llspatialpartition.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2aef348685..2f0a78b1b2 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -970,7 +970,9 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion) // Reset VB during TP if (is_tree_group && drawable->getVObj()) { - ((LLVOTree*)drawable->getVObj().get())->destroyVB(); + auto votree = dynamic_cast(drawable->getVObj().get()); + if (votree) + votree->destroyVB(); } // }