431b3b0c6d
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/pre-commit.yaml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llwindow/llopenglview-objc.mm
# indra/newview/CMakeLists.txt
# indra/newview/llappdelegate-objc.mm
2025-10-20 23:56:48 +02:00
1a58d3e023
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
...
# Conflicts:
# indra/cmake/APR.cmake
2025-10-20 23:16:15 +02:00
6f1df1a8d2
Bump actions/checkout from 4 to 5 ( #4867 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-20 13:32:50 -07:00
53041adc3d
Bump pre-commit/action from 3.0.0 to 3.0.1 ( #4864 )
...
Bumps [pre-commit/action](https://github.com/pre-commit/action ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pre-commit/action/releases )
- [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: pre-commit/action
dependency-version: 3.0.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-20 13:32:36 -07:00
0369072418
#4861 Crash at LLVolumeFace::createOctree
...
Looks like LLRiggedVolume::update goes out of bounds when selecting a face
2025-10-20 20:12:14 +03:00
41e9595522
Rework new convex decomp into a physicsextensions stub package and fix havok and havok_tpv builds for darwin universal to utilize new vhacd stub ( #4858 )
2025-10-20 13:10:19 -04:00
c847a5eaac
Update pre-commit hooks to v6.0.0
2025-10-20 19:39:49 +03:00
993851cc2a
Ignore tabs to spaces for objc in blame
2025-10-20 19:39:49 +03:00
11f73b0e7f
Fix tabs and trailing spaces in objc sources
2025-10-20 19:39:49 +03:00
f0d8e8f23c
Introduce dependabot configuration for Github Actions ( #4859 )
2025-10-20 09:36:36 -07:00
77746a648f
Prevent full rebuild each time CMake detects any changes
2025-10-20 11:27:00 +02:00
31b81b2c05
Corrected spacing and use of tab instead of spaces
2025-10-19 01:27:57 +10:00
eadf33f100
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2025-10-18 13:02:10 +02:00
b05f460b1a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-18 13:01:33 +02:00
5c03f284af
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/APR.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llsurface.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
2025-10-18 13:01:08 +02:00
9c9f555ae3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
2025-10-18 12:44:12 +02:00
d733bef269
Restore original indentation
2025-10-18 12:42:20 +02:00
36217e7cb3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llwebrtc/llwebrtc.cpp
# indra/llwebrtc/llwebrtc_impl.h
# indra/newview/llvoicewebrtc.cpp
# indra/newview/llvoicewebrtc.h
2025-10-18 12:33:24 +02:00
9fe6e65aed
Continue keeping built-in audio effects disabled - only disable duplicate call to updateDevices() which is already called via
...
LLWebRTCVoiceClient::initWebRTC() -> LLWebRTCVoiceClient::refreshDeviceLists() -> LLWebRTCImpl::refreshDevices()
and duplicate to
LLWebRTCVoiceClient::initWebRTC() -> llwebrtc::init() -> LLWebRTCImpl::init()
2025-10-18 12:26:47 +02:00
1acef3b7f0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-18 11:57:41 +02:00
0182399619
Bump viewer version tp 7.2.3 after 2025.07 release
2025-10-18 10:04:44 +03:00
4a6975a944
FIRE-36022 - Removing my USB headset crashes entire viewer
...
Commented out a block of new code recently added which was also being called by one of the callback functions.
This had the side effect of having 2 LLWebRTCDevicesObserver listening to the hardware removal events and cause both to trigger events at the same time, which may be the source of the queue being locked up in a race condition.
Was able to reproduce issue 2x without code change by moving mouse around a lot while on rezing and then pulling USB headset out of the USB port. Direct motherboard USB port seemed to work the best as could not trigger while headset was in USB hub.
2025-10-17 22:01:17 -03:00
3ca323db9e
Merge pull request #4850 from secondlife/geenz/main-to-develop
...
Catch some commits that didn't make it back to develop.
2025-10-17 19:30:49 -04:00
d066691c06
Merge branch 'main' of https://github.com/secondlife/viewer
2025-10-17 23:54:54 +02:00
2ca5c9ed74
Sync with develop
2025-10-17 23:54:36 +02:00
2d5f4da7d6
Fix typo
2025-10-17 23:53:38 +02:00
6252c2c0a8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
2025-10-17 23:44:55 +02:00
c696396df8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-17 23:40:43 +02:00
bbc2ad8fc5
Merge remote-tracking branch 'origin/main' into geenz/main-to-develop
2025-10-17 17:06:39 -04:00
aec7bf19eb
Merge pull request #4714 from secondlife/release/2025.07
...
Release/2025.07
2025-10-17 16:56:48 -04:00
b5c02e1914
FIRE-36021 Chinese Translation Update, by 小滢 Zi Ying
2025-10-17 13:01:25 +02:00
dd3175ae81
Fall back to using ad-hoc signing for macOS when no signing certificate exists (arm64 requirement)
2025-10-17 20:13:13 +10:00
4b3420c4ee
Set OutfitListFilterFullList to true by default to bring back the older behaviour of displaying filtered outfits that users are familiar with
...
This also ensures compatibility with skins that don't provide a toggle for this option (such as Starlight).
2025-10-17 08:36:25 +02:00
9328c8e559
Merge pull request 'Fixes for 2025.07 to compile on macOS'
2025-10-17 16:15:04 +10:00
119a31f9f6
Corrected CEF library path for macOS signing to fix signing error
2025-10-17 16:07:03 +10:00
6184be4e84
Updated autobuild.xml for missing MacOS universal libraries
2025-10-17 15:26:26 +10:00
076142913c
Remove unneeded code from viewer_manifest.py preventing packaging
2025-10-17 15:26:26 +10:00
b456ae2dc7
Fixed crash relating to looking for the wrong .xib resource file for MacOS
2025-10-17 15:26:25 +10:00
b542e69fe7
Fixed CMake files to work with MacOS universal libraries
2025-10-17 15:25:28 +10:00
6a522ed3fb
Initial fixes for 2025.07 to compile on MacOS
2025-10-17 15:25:28 +10:00
2d9b26a648
Fix compilation errors when building without Havok
2025-10-17 15:25:04 +10:00
27fe962a3a
Merge remote-tracking branch 'upstream/release/2025.07'
2025-10-17 15:20:58 +10:00
01a799495b
Merge pull request #4842 from secondlife/andreyk/viewer_4701
...
#4701 Fix incorrect architecture in package's name
2025-10-16 18:37:04 -04:00
06e8393846
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-16 22:48:43 +02:00
ad374a0176
#4701 Fix incorrect architecture in package's name
2025-10-16 23:20:14 +03:00
b011263b60
#3379 Fix callback cleanup
...
Instead of marking as 0, mark for cleanup
2025-10-16 20:14:47 +03:00
03fa846ac7
#4757 Fix missing quotes
2025-10-16 20:14:47 +03:00
790c52f3fd
Fix erroneous check for __attribute__ definition introduced with APR 1.7.5
...
With the update of APR to versoin 1.7.5., we have to deal with an erroneous check for the definition of __attribute__ added to the APR head file apr.h: The additional check for the definition of __has_attribute is nonsense as it is a C++ internal macro to check for the existance of certain attributes, however it has nothing to do with __attribute__ used in this context.
Since __attribute__ is not defined in MSVC, the modified, erroneous check now causes said definition becoming missing, resulting in a huge amount of "this declaration may not have extern 'C' linkage" errors within in MSVC.
This change utilizes CMake to patch the extracted APR header file, restoring the original version of the check.
2025-10-16 19:44:18 +03:00
9f192430ef
#2531 Fix gray background tiles in the Minimap ( #4815 )
2025-10-16 18:43:23 +03:00
6cdd9cff70
Fix C26444 compiler warning (creating unnamed RAII instances that could lead to unintended behavior)
2025-10-16 18:40:23 +03:00
Ansariel