livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,368 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

79368 Commits (806dd91c742fdf078741b32ea8cab8db074fa674)

Author SHA1 Message Date
Ansariel 806dd91c74 Don't specify maximum CMake version (even for the policy options) - results in weird empty outputs during build if using CMake newer than 4.0 2025-09-05 15:37:55 +02:00
Ansariel b99cf9fb86 Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/cmake/APR.cmake
#	indra/cmake/Audio.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/Meshoptimizer.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/llaudio/llvorbisencode.cpp
#	indra/llcommon/linden_common.h
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llfasttimer.cpp
#	indra/llcommon/llfasttimer.h
#	indra/llcommon/llfile.cpp
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llkdu/llimagej2ckdu.h
#	indra/llkdu/llkdumem.h
#	indra/llplugin/slplugin/CMakeLists.txt
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llopenglview-objc.mm
#	indra/llwindow/llwindowmacosx-objc.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/media_plugins/cef/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/viewer_manifest.py
 2025-09-05 14:55:37 +02:00
Callum Linden d885e73ddd
Merge pull request #4633 from secondlife/callum/viewer-cef-2025-08 
Incorporate latest version of Dullahan that is built using CEF 139 and target the Universal Mac build branch
 2025-09-04 15:17:55 -07:00
Callum Linden 66ccfabdd3
Merge branch 'project/mac_universal' into callum/viewer-cef-2025-08 2025-09-04 14:51:34 -07:00
Ansariel a601715860 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/installers/windows/installer_template.nsi
 2025-09-03 19:45:39 +02:00
Ansariel 4b8049e22b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-03 19:44:45 +02:00
Andrey Kleshchev 90aa693f2a
Merge Changes for support of apple silicon on macOS 
Mac Arm
 2025-09-03 20:30:12 +03:00
Andrey Kleshchev 5593cde0e8
Merge pull request #4625 from secondlife/andreyk/viewer_4587 
#4587 Shaders sometimes do not match the shader settings
 2025-09-03 19:09:48 +03:00
Andrey Kleshchev 46f325b7db #4587 Make shader cache reading faster 2025-09-02 23:29:15 +03:00
Andrey Kleshchev 3ea1d87a42 #4587 Shaders sometimes do not match the shader settings 
Ensure versions get matched reliably
 2025-09-02 23:29:15 +03:00
Ansariel 8a07a887ad Merge branch 'main' of https://github.com/secondlife/viewer 2025-09-02 21:59:44 +02:00
Andrey Kleshchev 3e4f112c03
Merge from main into develop 
Update develop branch from main to pick up 2025.05 and 2025.06 merge commits and version bump.
 2025-09-02 22:34:44 +03:00
Andrey Kleshchev e81b1de01e Increment viewer version after 2024.06 2025-09-02 22:29:55 +03:00
Andrey Kleshchev d1e185921d #4621 Crash at LLMeshRepoThread::run(1060) 
Fix a missed mutex
 2025-09-02 19:39:09 +02:00
Andrey Kleshchev 327fc9375f #4619 Don't crash on LLHUDEffect::render 
LLHUDEffectResetSkeleton needs to override LLHUDEffect::render to not
cause an LL_ERRS if it stays alive for too long.
 2025-09-02 19:39:09 +02:00
Rye 0ae3de8f1e Fix cmake to ${CMAKE_COMMAND} to avoid cmake error 2025-09-02 19:50:57 +03:00
Rye 012c0705bd MacOS companion changes for dullahan 1.21 including package structure and linkage fixes 2025-09-02 19:50:57 +03:00
Rye 0fe641a3f2 Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers 2025-09-02 19:50:57 +03:00
Andrey Kleshchev e5b7e8a9a8 #4621 Crash at LLMeshRepoThread::run(1060) 
Fix a missed mutex
 2025-09-02 19:31:33 +03:00
Andrey Kleshchev 9959f51741 #4619 Don't crash on LLHUDEffect::render 
LLHUDEffectResetSkeleton needs to override LLHUDEffect::render to not
cause an LL_ERRS if it stays alive for too long.
 2025-09-02 19:31:33 +03:00
Ansariel Hiller 1f53ef9808
Merge pull request #158 from FirestormViewer/dependabot/github_actions/actions/download-artifact-5 
Bump actions/download-artifact from 4 to 5
 2025-09-01 23:42:20 +02:00
Ansariel Hiller b4b8f0e10b
Merge pull request #157 from FirestormViewer/dependabot/github_actions/actions/checkout-5 
Bump actions/checkout from 4 to 5
 2025-09-01 23:42:09 +02:00
dependabot[bot] a21813339a
Bump actions/download-artifact from 4 to 5 
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-09-01 18:29:37 +00:00
dependabot[bot] 1afff91ed2
Bump actions/checkout from 4 to 5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-09-01 18:14:06 +00:00
Andrey Kleshchev 5d50a660bc #4588 Unable to direct silent installation 2025-09-01 19:23:12 +03:00
Ansariel 0573e31002 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/pipeline.cpp
 2025-08-31 12:07:48 +02:00
Ansariel ce6beeaad7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-31 11:45:41 +02:00
PanteraPolnocy 3899506394 Updated Polish translations 2025-08-30 23:34:34 +02:00
PanteraPolnocy 86cc08f895 Notification correction; Rename -> Remove 2025-08-30 21:00:14 +02:00
PanteraPolnocy 1478dc3d33 Remove duplicated inventory settings context menu option 2025-08-30 20:12:55 +02:00
Ansariel 3836e507e7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-30 12:22:35 +02:00
Ansariel a60170b69c Merge branch 'main' of https://github.com/secondlife/viewer 2025-08-30 12:13:26 +02:00
Callum Prentice db69b09d82 Merge branch 'develop' into callum/viewer-cef-2025-08 2025-08-29 14:51:08 -07:00
Andrey Kleshchev e77eb6b531 #4598 Fix variables being inited before settings are ready 2025-08-29 20:38:43 +03:00
Andrey Kleshchev 479fee984a #4604 Warn user off high settings when on low-RAM hardware 2025-08-29 19:56:04 +03:00
Andrey Kleshchev e23aa06049 #4604 Reduce draw distance when low on RAM 2025-08-29 19:56:04 +03:00
Jonathan "Geenz" Goodman 842ac1e150
Merge pull request #4379 from secondlife/release/2025.06 
Release/2025.06
 2025-08-29 12:48:44 -04:00
Rye 5ffcd3dc88 Fixes for GHA build 2025-08-28 17:58:33 -04:00
Rye d010e55b88 Tabs to spaces 2025-08-28 06:21:38 -04:00
Rye f1014eda27 Bump openjpeg to 2.5.3-r1 2025-08-28 06:19:15 -04:00
Rye 2b44464a14 Fix up windows build error in GHA 2025-08-28 06:08:13 -04:00
Rye 96ff5f8e70 Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac 2025-08-28 00:53:15 -04:00
Rye 77d71dec86 Fix up universal build 2025-08-28 00:43:38 -04:00
Rye 34ae3db498 Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac 2025-08-27 23:07:22 -04:00
Rye dae43ad532 Fix cmake to ${CMAKE_COMMAND} to avoid cmake error 2025-08-27 23:05:58 -04:00
Rye 536c821c09 MacOS companion changes for dullahan 1.21 including package structure and linkage fixes 2025-08-27 23:05:40 -04:00
Rye e629bf05d6 Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers 2025-08-27 22:36:55 -04:00
Callum Prentice 87ec630053 PUll in Dullahan 1.21 that contains additional updates for the macOS version which should help with the slow media startup issue 2025-08-27 15:30:32 -07:00
Dan Linden b246834207
Merge pull request #4607 from secondlife/Dan-Linden-patch-2 
Removed dan's z600 windows machine from the matrix. Added dan's mac, caleb's mac and kurt's windows machines.
 2025-08-27 11:02:53 -07:00
Andrey Kleshchev 0fc42e951f #4608 Crash at LLJoint::findJoint 
'this' is null inside findJoint according to bugsplat so likely mRoot
was not initialized yet.
 2025-08-27 16:09:14 +03:00