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 diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 40025cff68..e5d1eb3a4d 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 439ecb0613..5f02e32ab2 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 @@ -6757,7 +6757,7 @@ Type String Value - http://www.phoenixviewer.com/viewerfloater/howtofloater/index.html + https://wiki.firestormviewer.org/start#basic_functions Backup 0 @@ -18645,7 +18645,6 @@ Change of this parameter will affect the layout of buttons in notification toast script_floater world_map preferences - facebook flickr twitter 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 affd7143bd..703d4d70c5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3743,7 +3743,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/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 718e46e680..a0ba83b59e 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 diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a2610c449c..d59e90bac7 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3085,10 +3085,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 { diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp index d8fb85a7d5..95e182bbd6 100644 --- a/indra/newview/rlvcommon.cpp +++ b/indra/newview/rlvcommon.cpp @@ -346,6 +346,12 @@ void RlvStrings::saveToFile(const std::string& strFilePath) // Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a const std::string& RlvStrings::getAnonym(const std::string& strName) { + if (!rlv_handler_t::isEnabled()) + { + static std::string strNobody = LLTrans::getString("AvatarNameNobody"); + return strNobody; + } + const char* pszName = strName.c_str(); U32 nHash = 0; // Test with 11,264 SL names showed a 3.33% - 3.82% occurance for each so we *should* get a very even spread 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