From f3245b8158ab68954d892065d394bd00de2ed1f4 Mon Sep 17 00:00:00 2001 From: Liny Date: Mon, 6 Jun 2022 21:52:37 -0700 Subject: [PATCH 1/9] Fix FIRE-31717 - Typo in a Linux script --- indra/newview/linux_tools/refresh_desktop_app_entry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh b/indra/newview/linux_tools/refresh_desktop_app_entry.sh index c8f597d7de..f6d2e2e474 100755 --- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh +++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh @@ -20,7 +20,7 @@ Terminal=false\n\ Type=Application\n\ Categories=Application;Internet;Network;\n\ StartupNotify=true\n\ -X-Desktop-File-Install-Version=3.0\n +X-Desktop-File-Install-Version=3.0\n\ StartupWMClass=do-not-directly-run-firestorm-bin" echo " - Installing menu entries in ${desktop_entries_dir}" From f95037e929db34dc62c3cbfd5569e9afb582679f Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Wed, 8 Jun 2022 14:08:26 +0200 Subject: [PATCH 2/9] FIRE-31719 - Fix storing camera position and focus while in flycam mode --- indra/newview/llagentcamera.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index b8a7bb482b..d376cb8beb 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -3266,7 +3266,13 @@ S32 LLAgentCamera::directionToKey(S32 direction) void LLAgentCamera::storeCameraPosition() { gSavedPerAccountSettings.setVector3d("FSStoredCameraPos", getCameraPositionGlobal()); - gSavedPerAccountSettings.setVector3d("FSStoredCameraFocus", getFocusTargetGlobal()); + + // get a vector pointing forward from the camera view manually, getFocusTargetGlobal() will + // not return useful values if the camera is in flycam mode or was just switched out of + // flycam mode and not repositioned after + LLVector3d forward = LLVector3d(1.0, 0.0, 0.0) * LLViewerCamera::getInstance()->getQuaternion() + getCameraPositionGlobal(); + gSavedPerAccountSettings.setVector3d("FSStoredCameraFocus", forward); + LLUUID stored_camera_focus_object_id = LLUUID::null; if (mFocusObject) { @@ -3296,6 +3302,15 @@ void LLAgentCamera::loadCameraPosition() return; } + // switch off flycam mode if needed + if (LLViewerJoystick::getInstance()->getOverrideCamera()) + { + handle_toggle_flycam(); + + // exiting from flycam usually keeps the camera where it is but here we want it to actually move + LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true); + } + unlockView(); setCameraPosAndFocusGlobal(stored_camera_pos, stored_camera_focus, stored_camera_focus_object_id); } From 7d904ef68bb8bcf770a61979cff945d4dbd1dfa6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 11 Jun 2022 16:45:08 +0200 Subject: [PATCH 3/9] Let's just do this... --- indra/newview/featuretable.txt | 14 +++++++------- indra/newview/featuretable_linux.txt | 14 +++++++------- indra/newview/featuretable_mac.txt | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 802ed77230..310c0af25d 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -162,7 +162,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// Medium High Graphics Settings +// Medium High Graphics Settings (deferred enabled) // list MidHigh RenderAnisotropic 1 1 @@ -183,7 +183,7 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 -RenderDeferred 1 0 +RenderDeferred 1 1 RenderDeferredSSAO 1 0 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 @@ -191,7 +191,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Graphics Settings +// High Graphics Settings (deferred + SSAO) // list High RenderAnisotropic 1 1 @@ -212,15 +212,15 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 -RenderDeferred 1 0 -RenderDeferredSSAO 1 0 +RenderDeferred 1 1 +RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Ultra Graphics Settings (deferred) +// High Ultra Graphics Settings (deferred + SSAO) // list HighUltra RenderAnisotropic 1 1 @@ -242,7 +242,7 @@ RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 RenderDeferred 1 1 -RenderDeferredSSAO 1 0 +RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 56b766e993..1ee21efc12 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -163,7 +163,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// Medium High Graphics Settings +// Medium High Graphics Settings (deferred enabled) // list MidHigh RenderAnisotropic 1 1 @@ -184,7 +184,7 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 -RenderDeferred 1 0 +RenderDeferred 1 1 RenderDeferredSSAO 1 0 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 @@ -192,7 +192,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Graphics Settings +// High Graphics Settings (deferred + SSAO) // list High RenderAnisotropic 1 1 @@ -213,15 +213,15 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 -RenderDeferred 1 0 -RenderDeferredSSAO 1 0 +RenderDeferred 1 1 +RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Ultra Graphics Settings (deferred) +// High Ultra Graphics Settings (deferred + SSAO) // list HighUltra RenderAnisotropic 1 1 @@ -243,7 +243,7 @@ RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 RenderDeferred 1 1 -RenderDeferredSSAO 1 0 +RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 047b8dd4b4..bffbbec13b 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -60,7 +60,7 @@ WLSkyDetail 1 128 Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderTextureMemoryMultiple 1 1.0 -RenderCompressTextures 1 1 +RenderCompressTextures 1 1 RenderShaderLightingMaxLevel 1 3 RenderDeferred 1 1 RenderDeferredSSAO 1 1 @@ -161,7 +161,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// Medium High Graphics Settings +// Medium High Graphics Settings (deferred enabled) // list MidHigh RenderAnisotropic 1 1 @@ -182,7 +182,7 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 -RenderDeferred 1 0 +RenderDeferred 1 1 RenderDeferredSSAO 1 0 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 @@ -190,7 +190,7 @@ WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Graphics Settings (deferred) +// High Graphics Settings (deferred + SSAO) // list High RenderAnisotropic 1 1 @@ -212,14 +212,14 @@ RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 RenderDeferred 1 1 -RenderDeferredSSAO 1 0 +RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 // -// High Ultra Graphics Settings (deferred) +// High Ultra Graphics Settings (deferred + SSAO) // list HighUltra RenderAnisotropic 1 1 @@ -241,7 +241,7 @@ RenderTreeLODFactor 1 0.5 RenderVolumeLODFactor 1 2.0 WindLightUseAtmosShaders 1 1 RenderDeferred 1 1 -RenderDeferredSSAO 1 0 +RenderDeferredSSAO 1 1 RenderShadowDetail 1 0 RenderUseAdvancedAtmospherics 1 0 WLSkyDetail 1 48 From 8a111fd155fcacd76d2018e11c1afabc04dfabec Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 15 Jun 2022 10:41:05 +0200 Subject: [PATCH 4/9] Move this where it is in the LL viewer... --- indra/newview/pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 19187b1d7e..18558a6c1b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7488,13 +7488,13 @@ void LLPipeline::doResetVertexBuffers(bool forced) gSky.resetVertexBuffers(); LLVOPartGroup::destroyGL(); - gGL.resetVertexBuffer(); if ( LLPathingLib::getInstance() ) { LLPathingLib::getInstance()->cleanupVBOManager(); } LLVOPartGroup::destroyGL(); + gGL.resetVertexBuffer(); SUBSYSTEM_CLEANUP(LLVertexBuffer); From db778622538b942ac4a335d8d54116cc3055b38e Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 15 Jun 2022 19:33:46 +0200 Subject: [PATCH 5/9] Enable signing for OSX. --- indra/cmake/00-Common.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index fe319a587b..17ac5b61e4 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -245,9 +245,9 @@ if (DARWIN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}") # NOTE: it's critical that the optimization flag is put in front. # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. -## Really?? On developer machines too? -##set(ENABLE_SIGNING TRUE) -##set(SIGNING_IDENTITY "Developer ID Application: Phoenix Firestorm Project, Inc., The"") + +set(ENABLE_SIGNING TRUE) +set(SIGNING_IDENTITY "Developer ID Application: The Phoenix Firestorm Project, Inc." ) endif (DARWIN) From 8c483d01d3d32d3b10980a721018b49bbdb461d2 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 15 Jun 2022 19:40:17 +0200 Subject: [PATCH 6/9] Apple signing tweaks for Firestorm. --- indra/newview/viewer_manifest.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f8b4d89efc..972c4658ac 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1760,8 +1760,15 @@ class DarwinManifest(ViewerManifest): sign_retry_wait=15 resources = app_in_dmg + "/Contents/Resources/" plain_sign = glob.glob(resources + "llplugin/*.dylib") + + # Even though we got some dylibs in Resources signed by LL, we also got some there that are *NOT* + # At least: fmod, growl, GLOD + # We could selectively sign those, or repackage them and then sign them. For an easy clean sweet we just resign them al + plain_sign += glob.glob(resources + "*.dylib") + deep_sign = [ - resources + "updater/SLVersionChecker", + # Firestorm does not ship SLVersionChecker + #resources + "updater/SLVersionChecker", resources + "SLPlugin.app/Contents/MacOS/SLPlugin", app_in_dmg, ] @@ -1800,7 +1807,9 @@ class DarwinManifest(ViewerManifest): else: print("Maximum codesign attempts exceeded; giving up", file=sys.stderr) raise sign_failed - self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg]) + # This fails sometimes and works other times. Even when notarization (down below) is a success + # Remove it for now and investigate after we did notarize a few times + #self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg]) self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg]) finally: From 85e0c4b7ba1177be701b9b3ba6b91000aa24ef7c Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 15 Jun 2022 19:42:36 +0200 Subject: [PATCH 7/9] Correct bundle id for OSX signing. --- indra/newview/CMakeLists.txt | 2 +- indra/newview/installers/darwin/apple-notarize.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 470ffff2c3..94bb0ac496 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2678,7 +2678,7 @@ if (DARWIN) set(MACOSX_EXECUTABLE_NAME "Firestorm") set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer") set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.firestormviewer.firestorm") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_BUNDLE_NAME "Firestorm") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh index d90772ec0e..ce012d84ed 100755 --- a/indra/newview/installers/darwin/apple-notarize.sh +++ b/indra/newview/installers/darwin/apple-notarize.sh @@ -11,7 +11,7 @@ if [[ -f "$CONFIG_FILE" ]]; then zip_file=${app_file/app/zip} ditto -c -k --keepParent "$app_file" "$zip_file" if [[ -f "$zip_file" ]]; then - res=$(xcrun altool --notarize-app --primary-bundle-id "com.secondlife.viewer" \ + res=$(xcrun altool --notarize-app --primary-bundle-id "org.firestormviewer.firestorm" \ --username $USERNAME \ --password $PASSWORD \ --asc-provider $ASC_PROVIDER \ From dda233a03d59e4b382832b43f56b62a420f1126a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 18 Jun 2022 14:30:48 +0200 Subject: [PATCH 8/9] Fix label width in sky editor --- .../skins/default/xui/en/panel_settings_sky_atmos.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index acab8bdc24..d01318d0b7 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -244,7 +244,7 @@ layout="topleft" left="5" top_pad="10" - width="100"> + width="105"> Density Multiplier: + width="105"> Distance Multiplier: + width="105"> Maximum Altitude: + width="105"> Scene Gamma: From f67f54722c40450f4c651c0359500702f6dfa328 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 18 Jun 2022 14:38:46 +0200 Subject: [PATCH 9/9] Fix misleading description of FSParticleChat debug setting --- 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 b561912dcd..f65d5bb8e4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -19810,7 +19810,7 @@ Change of this parameter will affect the layout of buttons in notification toast FSParticleChat Comment - Speak Particle Info on channel 9000 + Send Selection Info on channel 9000 when editing objects (does not work if PrivatePointAtTarget is enabled) Persist 1 Type