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

Merge remote-tracking branch 'origin/master'

meow-7.2.2
Beq 2021-09-15 21:40:53 +01:00
parent e5754732dd 36439c9f13
commit 7c1d28f7be
14 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -850,9 +850,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2b29e6435ea9487bc2019a28b8287d6a</string>
<string>7b8fd7a8ea9850f1cad187059d2da4af</string>
<key>url</key>
<string>http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2</string>
<string>http://3p.firestormviewer.org/dullahan-1.12.2.202109131147_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212560947.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -1932,9 +1932,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3b8b0f54c851f136e2a92e1c6ba724a5</string>
<string>e99b86fc3ed48a778580dd1449f8f33b</string>
<key>url</key>
<string>file:///opt/firestorm/kdu-8.1-darwin64-211970151.tar.bz2</string>
<string>file:///opt/firestorm/kdu-8.2-darwin-212431232.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>

8
indra/llfilesystem/lldiskcache.cpp
View File

@ -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;
}
@ -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)
{
@ -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<std::chrono::milliseconds>(end_time - start_time).count();
@ -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)
{

2
indra/media_plugins/cef/media_plugin_cef.cpp
View File

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

4
indra/newview/app_settings/grids.xml
View File

@ -953,7 +953,7 @@
<string>agent</string>
</array>
<key>loginpage</key>
<string>http://phoenixviewer.com/app/loginV3/</string>
<string>https://phoenixviewer.com/app/loginV3/</string>
<key>loginuri</key>
<array>
<string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
@ -986,7 +986,7 @@
<string>agent</string>
</array>
<key>loginpage</key>
<string>http://phoenixviewer.com/app/loginV3/</string>
<string>https://phoenixviewer.com/app/loginV3/</string>
<key>loginuri</key>
<array>
<string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>

2
indra/newview/app_settings/settings.xml
View File

@ -24235,7 +24235,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://phoenixviewer.com/app/loginV3/secondlifegrid.xml</string>
<string>https://phoenixviewer.com/app/loginV3/secondlifegrid.xml</string>
</map>
<key>FSIgnoreAdHocSessions</key>
<map>

2
indra/newview/fsgridhandler.cpp
View File

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

4
indra/newview/llspatialpartition.cpp
View File

@ -970,7 +970,9 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
// <FS:Ansariel> Reset VB during TP
if (is_tree_group && drawable->getVObj())
{
((LLVOTree*)drawable->getVObj().get())->destroyVB();
auto votree = dynamic_cast<LLVOTree*>(drawable->getVObj().get());
if (votree)
votree->destroyVB();
}
// </FS:Ansariel>
}

2
indra/newview/llviewernetwork.cpp
View File

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

2
indra/newview/skins/default/xui/en/panel_fs_login.xml
View File

@ -12,7 +12,7 @@
width="1024">
<panel.string
name="real_url" translate="false">
http://phoenixviewer.com/app/loginV3/
https://phoenixviewer.com/app/loginV3/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/

2
indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Outfit Gallery">
<string name="outfit_photo_string">
Zdjęcie stroju: "[OUTFIT_NAME]"
Zdjecie stroju: "[OUTFIT_NAME]"
</string>
<string name="no_outfits_msg">
Nie ma jeszcze żadnych strojów. Spróbuj [secondlife:///app/search/all/ Wyszukiwarki]

2
indra/newview/skins/latency/xui/en/panel_fs_login.xml
View File

@ -15,7 +15,7 @@
name="real_url"
translate="false"
>
http://phoenixviewer.com/app/loginV3/
https://phoenixviewer.com/app/loginV3/
</panel.string>
<string
name="reg_in_client_url"

2
indra/newview/skins/starlight/xui/en/panel_fs_login.xml
View File

@ -12,7 +12,7 @@
width="1024">
<panel.string
name="real_url" translate="false">
http://phoenixviewer.com/app/loginV3/
https://phoenixviewer.com/app/loginV3/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/

2
indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
View File

@ -12,7 +12,7 @@
width="1024">
<panel.string
name="real_url" translate="false">
http://phoenixviewer.com/app/loginV3/
https://phoenixviewer.com/app/loginV3/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/

18
indra/newview/viewer_manifest.py
View File

@ -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"):
@ -1917,18 +1917,14 @@ 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( "resources.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( "resources.pak" )
self.path( "icudtl.dat" )
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):