b49c3a083b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-12-03 18:39:36 +01:00
b65088fcee
FIRE-36128 partial: Move splash screen settings from CEF's localStorage to the viewer's settings file
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
2025-12-01 21:12:47 +01:00
8a1085c3cb
Added llphysicsextensionsos as a dependency of newview since occasionally it wasn’t built before newview, causing a build failure
2025-11-29 04:15:54 +10:00
d63cb2052f
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-11-19 11:05:41 +10:00
b6ba43bed5
Initial VHACD based llconvexdecomposition
2025-11-19 10:47:34 +10:00
307bc44ce8
Look for Havok_TPV where it should be as it isn't in /lib
2025-11-19 02:16:44 +10:00
be91f40da3
Try looking for Havok_TPV in /lib instead...
2025-11-18 21:41:53 +10:00
54212f1b6c
More fixes for Havok_TPV to try compile on macOS with universal build
2025-11-18 20:10:20 +10:00
fc7a909b8d
Further attempted fixes for building with Havok_TPV on macOS
2025-11-18 12:59:01 +10:00
aa4d373212
Attempted fix for building with Havok_TPV
2025-11-18 10:50:53 +10:00
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
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
31b81b2c05
Corrected spacing and use of tab instead of spaces
2025-10-19 01:27:57 +10: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
bbc2ad8fc5
Merge remote-tracking branch 'origin/main' into geenz/main-to-develop
2025-10-17 17:06:39 -04:00
b456ae2dc7
Fixed crash relating to looking for the wrong .xib resource file for MacOS
2025-10-17 15:26:25 +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
e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
b1f05340f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:41:58 +02:00
98a48cf1c1
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:35:54 +02:00
b277cc6a8f
Initial VHACD based llconvexdecomposition
2025-10-03 09:51:03 -04:00
e30bc61d9a
Restore creation of secondlife-bin.MAP file on Darwin x86_64 for production of llphysicsextensions_tpv
2025-10-02 14:51:14 -07:00
b314a0bb64
new llphysicsextensions_source package that sets OSX_ARCHITECTURES properly
...
and should hopefully package llphysicsextensions_tpv successfully
2025-10-02 13:35:54 -07:00
fc41f57a06
Attempt to fix build error
2025-10-02 11:26:48 -07:00
b8cf54d909
Fix configurations like windows where LLPHYSICSEXTENSIONS_STUB_DIR is unset
2025-10-01 18:17:16 -07:00
589498fece
Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64
2025-10-01 18:01:19 -07:00
dddce2b568
FIRE-35794: First pass at restoring pose state
...
Updated save version: now saves all the playing poses and their times, making 'diffs' much more useful.
Loading attempts to replay the pose at that time; making several tries if needed.
These poses restore the 'base' rotation state (position needs work).
2025-09-14 20:47:28 +01:00
255b5c6381
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/LLKDU.cmake
# indra/newview/CMakeLists.txt
2025-09-06 12:03:58 +02:00
8f43b5b77b
Fix macos build arch and deploy target due to cmake behavior changes
2025-09-05 19:35:22 -04:00
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
34ae3db498
Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac
2025-08-27 23:07:22 -04:00
536c821c09
MacOS companion changes for dullahan 1.21 including package structure and linkage fixes
2025-08-27 23:05:40 -04:00
950fa11bcb
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloatersearch.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_search.xml
2025-08-25 11:26:30 +02:00
cefee59b0e
Improved open performance for some web based UI floaters by preloading the web content during login ( #4574 )
...
* First phase of some work to replace certain UI web based floaters with a much more simple floater (no more browserish web-content-floater) and then pre-load content as login is progressing. This means that after login, the floater can be opened much more rapidly than now. This first commit does this process for the Search floater
* This commit brings in a new marketplace floater than hosts the marketplace web page (no more webcontent floater here either). It works as expected and opens quickly but the user is not logged in when the page is opened so that needs to be tackled before we can declare that this is a viable solution
* This commit introduces a way to set the openID cookie that arrives via login.cgi into all the instances that are preloaded - the result is that when you open the preloaded floater after login, you are logged into your linden account
* Fix a mac only warning as error - function overrides a member function but is not marked 'override'
* Marchcat spotted left over cruft from earlier dev when we used a trimmed down URL for the pre-load search. Now we use the same search URL throughout and zero out the query parameters
2025-08-22 16:21:31 -07:00
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
9c73af6e2a
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
2025-08-14 20:30:27 +02:00
6491cb0307
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506
2025-08-14 20:08:01 +02:00
4c65a43e17
CMake 4.10 compatibility fixes ( #4548 )
2025-08-14 09:47:22 -07:00
6f072c2121
Merge 2025.06 into develop
...
Merge 2025.06 into develop
2025-08-14 11:17:35 +03:00
b0b8328c5c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llrendertarget.cpp
# indra/newview/gltf/asset.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoicewebrtc.cpp
# indra/newview/viewer_manifest.py
2025-08-12 22:50:51 +02:00
e3d15a9146
Chore: Move message.xml to scripts/messages ( #4501 )
...
* Move message.xml to scripts/messages
Get rid of the top-level etc/ directory by moving its only contents: message.xml to scripts/messages
* Move message.xml to app_settings
* Remove unneeded inclusion in viewer_manifest.py
2025-08-12 09:02:07 -07:00
539959a7f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
2025-08-06 18:47:44 +02:00
c43b544dc6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202505
2025-08-06 18:26:27 +02:00
ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
acc8928330
Merge release/2025.05 into develop
2025-08-06 14:17:18 +03:00
2034100049
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Discord.cmake
# indra/newview/CMakeLists.txt
# indra/newview/llfloaterpreference.cpp
# indra/newview/viewer_manifest.py
2025-08-05 17:50:50 +02:00
61d53a8731
#4470 Plug in Discord SDK package
2025-08-05 18:26:29 +03:00
debb86fb57
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/cmake/Discord.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llspeakers.cpp
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2025-08-01 00:03:48 +02:00
Ansariel