From 169fc57a35af3710106ca1f2d085ce90f8ea2635 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 30 Sep 2019 21:01:44 +0200 Subject: [PATCH 01/10] FIRE-29000: Update URL to Firestorm wiki --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7a803d5a7b..b8006f8533 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6744,7 +6744,7 @@ Type String Value - http://wiki.phoenixviewer.com/[TOPIC] + https://wiki.firestormviewer.org/[TOPIC] Backup 0 From 4ad358fe13497917cfa8d3b42660e4b6ecc9067a Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Mon, 30 Sep 2019 14:43:42 -0500 Subject: [PATCH 02/10] Provide null code signing identity for Xcode 11. Thanks to Nicky Perrian. --- indra/cmake/Variables.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 12fc7b295f..68ce364e48 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -147,6 +147,9 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) + set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") + message(STATUS "CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY = '${CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}'") + string(REGEX MATCH "-mmacosx-version-min=([^ ]+)" scratch "$ENV{LL_BUILD}") set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}") message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'") From b185affe80f42862cb1e2a5209fc7b44072c9aee Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 1 Oct 2019 18:30:40 +0200 Subject: [PATCH 03/10] Tag release 6.3.2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 04f3542d2c..603b334154 100755 --- a/.hgtags +++ b/.hgtags @@ -39,6 +39,7 @@ ab632018105ccfdf8a9e5ea1a8302badd58b686e Firestorm_5.0.1_Release 8888a131acad19c49fcff1ad2cf75c54c8a41bb8 Firestorm_6.0.1_Beta ba5e1592f3a79317a3ebac441ee5946a81b97fab Firestorm_6.0.2_Release 7b5a98fba31fa019bddb3ae900c6dd94604bc8be Firestorm_6.2.4_Release +381d04b870a59ef98cc442a5d4aeb6b38cfdbed7 Firestorm_6.3.2_Release bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release 003dd9461bfa479049afcc34545ab3431b147c7c v2start 52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3 From a887b2cda8b3ea0b57fd2ef77aab4bbaba4a9f32 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 1 Oct 2019 18:34:41 +0200 Subject: [PATCH 04/10] FIRE-29009: Remove Facebook floater from list of always showable floaters --- indra/newview/app_settings/settings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b8006f8533..30c2f55f03 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -18601,7 +18601,6 @@ Change of this parameter will affect the layout of buttons in notification toast script_floater world_map preferences - facebook flickr twitter From 566a514dd8a91680150f0058089c836e18ea141f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 2 Oct 2019 19:43:13 +0200 Subject: [PATCH 05/10] Fix Discord not auto-connecting anymore --- indra/newview/llvoavatar.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 33f87ecac1..3c7b18abdd 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3080,10 +3080,9 @@ void LLVOAvatar::idleUpdateLoadingEffect() // Animation Overrider AOEngine::instance().onLoginComplete(); -#ifdef HAS_DISCORD + // tapping a place that happens on landing in world to start up discord FSDiscordConnect::instance().checkConnectionToDiscord(gSavedPerAccountSettings.getBOOL("FSEnableDiscordIntegration")); -#endif } else { From 04f9e3cede6b572d8f36c5403565065b3d0a516d Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 6 Oct 2019 22:10:07 +0200 Subject: [PATCH 06/10] FIRE-29031; Properly handle nullptr values. --- indra/newview/lltoolpie.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f9d390d311..f9f5006162 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -143,6 +143,12 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) // !transparent_object check will be covered by transparent_object == visible_object. mPick = transparent_pick; } + // FIRE-29031; Handle transparent being nullptr (due to RLVa?). visible_object cannot be invalid here or the if above had been entered + else if( !transp_object) + { + mPick = visible_pick; + } + // else { // Select between two non-null picks From 3dadd1a95bbf2062c9280869a386b2ec312e5e38 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 7 Oct 2019 09:54:33 +0200 Subject: [PATCH 07/10] Changed phoenixviewer.com to firestormviewer.org in few applicable places Obviously, search & replace (for XML files), plus some manual reviewing --- indra/llwindow/llwindowmacosx.cpp | 2 +- indra/newview/app_settings/settings.xml | 2 +- indra/newview/linux_tools/client-readme.txt | 10 +++++----- indra/newview/linux_tools/wrapper.sh | 2 +- indra/newview/llappviewer.cpp | 2 +- indra/newview/llpanelobject.cpp | 2 +- .../skins/default/xui/da/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/de/floater_media_browser.xml | 2 +- .../skins/default/xui/de/floater_web_content.xml | 4 ++-- indra/newview/skins/default/xui/de/notifications.xml | 4 ++-- .../skins/default/xui/de/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/en/floater_media_browser.xml | 2 +- .../skins/default/xui/en/floater_web_content.xml | 4 ++-- indra/newview/skins/default/xui/en/menu_login.xml | 4 ++-- indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ++++---- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- .../skins/default/xui/en/panel_preferences_setup.xml | 4 ++-- indra/newview/skins/default/xui/en/strings.xml | 2 +- .../skins/default/xui/es/floater_media_browser.xml | 2 +- .../skins/default/xui/es/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/fr/floater_media_browser.xml | 2 +- .../skins/default/xui/fr/floater_web_content.xml | 4 ++-- .../skins/default/xui/fr/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/it/floater_media_browser.xml | 2 +- .../skins/default/xui/it/floater_web_content.xml | 4 ++-- indra/newview/skins/default/xui/it/notifications.xml | 4 ++-- .../skins/default/xui/it/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/ja/floater_web_content.xml | 4 ++-- indra/newview/skins/default/xui/ja/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/ja/notifications.xml | 4 ++-- .../skins/default/xui/ja/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/pl/floater_media_browser.xml | 2 +- .../skins/default/xui/pl/floater_web_content.xml | 4 ++-- indra/newview/skins/default/xui/pl/notifications.xml | 4 ++-- .../skins/default/xui/pl/panel_preferences_setup.xml | 4 ++-- .../skins/default/xui/pt/panel_preferences_setup.xml | 2 +- .../skins/default/xui/ru/panel_preferences_setup.xml | 2 +- .../skins/default/xui/tr/panel_preferences_setup.xml | 2 +- .../skins/default/xui/zh/panel_preferences_setup.xml | 2 +- 39 files changed, 66 insertions(+), 66 deletions(-) diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 9868718c27..5d0961c03d 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -77,7 +77,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card) "\n" "If you own a supported card and continue to receive this message, try \n" "updating to the latest video card drivers. Otherwise contact the\n" - "Phoenix Viewer Support group in world, or visit www.phoenixviewer.com\n" + "Phoenix Viewer Support group in world, or visit www.firestormviewer.org\n" "for support.\n" "\n" "You can try to run Firestorm, but it will probably crash or run\n" diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 30c2f55f03..fda34e2d72 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6757,7 +6757,7 @@ Type String Value - http://www.phoenixviewer.com/viewerfloater/howtofloater/index.html + https://wiki.firestormviewer.org/start#basic_functions Backup 0 diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt index ac256239a8..71f0b65155 100644 --- a/indra/newview/linux_tools/client-readme.txt +++ b/indra/newview/linux_tools/client-readme.txt @@ -126,7 +126,7 @@ SOLUTION:- Usually this indicates that your graphics card does not meet * If your distribution does not make it easy, then you can download the required Linux drivers straight from your graphics card manufacturer: - - + - PROBLEM 2:- My whole system seems to hang when running Firestorm. SOLUTION:- This is typically a hardware/driver issue. The first thing to @@ -201,19 +201,19 @@ configuration options for advanced troubleshooters. We're pleased to have released Firestorm client's source code under an Open Source license compatible with the 'LGPL'. - + 8. GETTING MORE HELP AND REPORTING PROBLEMS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- For general help and support with Firestorm: - + In-world discussion: Main support: Join one of our in-world support groups. - + There is also a 'Linux Client Users' group inside Second Life which is free to join. You can find it by pressing the 'Search' button at @@ -222,7 +222,7 @@ searching for 'Linux'. This group is useful for discussing Linux issues with fellow Linux client users who are online. The Firestorm Issue Tracker: - + This is the right place for finding known issues and reporting new bugs in all Firestorm releases if you find that the Troubleshooting section in this file hasn't helped. diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 6f924f50b3..0654a07b4e 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -183,7 +183,7 @@ most common problems when launching the Viewer (particularly loading shared libraries') may be solved by enabling 32-bit architecture and installing one or more 32-bit compatibility libraries. Consult the Firestorm wiki at -http://wiki.phoenixviewer.com/32-bit_viewer_in_64-bit_linux +http://wiki.firestormviewer.org/32-bit_viewer_in_64-bit_linux EOFMARKER fi fi diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 26b286b291..b8dea0fd3d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3733,7 +3733,7 @@ LLSD LLAppViewer::getViewerInfo() const // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); // FIRE-13993: Leave out channel so we can use a URL like - // http://wiki.phoenixviewer.com/firestorm_change_log_x.y.z.rev + // http://wiki.firestormviewer.org/firestorm_change_log_x.y.z.rev //if (! LLStringUtil::endsWith(url, "/")) // url += "/"; //url += LLURI::escape(LLVersionInfo::getVersion()) + ".html"; diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 172def4395..8d670f8c80 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1546,7 +1546,7 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp) childSetVisible("ObjectLODbehaviourLabel", true); // Setup the LL defaults - factor = 1.125f; // LL default for most people http://wiki.phoenixviewer.com/support:whirly_fizzle#lod_comparison + factor = 1.125f; // LL default for most people http://wiki.firestormviewer.org/support:whirly_fizzle#lod_comparison args["FACTOR"] = llformat("%.3f", factor); tb = getChild("LOD_swap_ll_default"); tb->setToolTip(getString("ll_lod_tooltip_msg",args)); diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 808723dfce..e1b845d02d 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -3,7 +3,7 @@ - Maksimum båndbredde ([http://wiki.phoenixviewer.com/fs_speedtest need a suggestion?]): + Maksimum båndbredde ([http://wiki.firestormviewer.org/fs_speedtest need a suggestion?]): @@ -14,7 +14,7 @@ - Cache størrelse ([http://wiki.phoenixviewer.com/cache need a suggestion?]): + Cache størrelse ([http://wiki.firestormviewer.org/cache need a suggestion?]): Cache placering: diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml index c0597b708d..ddab7f25c7 100644 --- a/indra/newview/skins/default/xui/de/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml @@ -26,7 +26,7 @@ Das Medien-Browser-Plugin lädt gerade. Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter -http://wiki.phoenixviewer.com/fs_media +http://wiki.firestormviewer.org/fs_media