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

Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546

master
Ansariel 2022-06-27 16:13:37 +02:00
parent 5d3d60074b 9e003e13c3
commit f76f1445f7
12 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/00-Common.cmake
View File

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

2
indra/newview/CMakeLists.txt
View File

@ -2680,7 +2680,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}")

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

@ -19935,7 +19935,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>FSParticleChat</key>
<map>
<key>Comment</key>
<string>Speak Particle Info on channel 9000</string>
<string>Send Selection Info on channel 9000 when editing objects (does not work if PrivatePointAtTarget is enabled)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

14
indra/newview/featuretable.txt
View File

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

14
indra/newview/featuretable_linux.txt
View File

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

14
indra/newview/featuretable_mac.txt
View File

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

2
indra/newview/installers/darwin/apple-notarize.sh
View File

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

2
indra/newview/linux_tools/refresh_desktop_app_entry.sh
View File

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

17
indra/newview/llagentcamera.cpp
View File

@ -3272,7 +3272,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)
{
@ -3302,6 +3308,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);
}

2
indra/newview/pipeline.cpp
View File

@ -7521,13 +7521,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);

10
indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
View File

@ -244,7 +244,7 @@
layout="topleft"
left="5"
top_pad="10"
width="100">
width="105">
Density Multiplier:
</text>
<slider
@ -268,7 +268,7 @@
layout="topleft"
left="5"
top_pad="15"
width="100">
width="105">
Distance Multiplier:
</text>
<slider
@ -292,7 +292,7 @@
layout="topleft"
left="5"
top_pad="15"
width="100">
width="105">
Maximum Altitude:
</text>
<slider
@ -316,7 +316,7 @@
layout="topleft"
left="5"
top_pad="15"
width="100">
width="105">
Scene Gamma:
</text>
<slider
@ -330,7 +330,7 @@
max_val="20"
name="scene_gamma"
top_delta="0"
width="207"
width="219"
can_edit_text="true"/>
</layout_panel>
</layout_stack>

13
indra/newview/viewer_manifest.py
View File

@ -1753,8 +1753,15 @@ class DarwinManifest(ViewerManifest):
sign_retry_wait=15
resources = app_in_dmg + "/Contents/Resources/"
plain_sign = glob.glob(resources + "llplugin/*.dylib")
# <FS:ND> 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",
# <FS:ND> 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])
# <FS:ND> 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: