diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index d25d9ae026..e34283d728 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -251,9 +251,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) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f9a3c934dd..14b8e091d1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2674,7 +2674,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/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8c9eda5847..bdfaa0531f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -19867,7 +19867,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 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 \ 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}" diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 69ca8901d8..dde745b1c6 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); } 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: diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3ecff66233..2b7784a054 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1753,8 +1753,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, ] @@ -1793,7 +1800,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: