Commit Graph

3302 Commits (d63cb2052f99a257d9f7a8a21f1c41284ae118b5)

Author SHA1 Message Date
Rye 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
Rye b6ba43bed5 Initial VHACD based llconvexdecomposition 2025-11-19 10:47:34 +10:00
Hecklezz 307bc44ce8 Look for Havok_TPV where it should be as it isn't in /lib 2025-11-19 02:16:44 +10:00
Hecklezz be91f40da3 Try looking for Havok_TPV in /lib instead... 2025-11-18 21:41:53 +10:00
Hecklezz 54212f1b6c More fixes for Havok_TPV to try compile on macOS with universal build 2025-11-18 20:10:20 +10:00
Hecklezz fc7a909b8d Further attempted fixes for building with Havok_TPV on macOS 2025-11-18 12:59:01 +10:00
Hecklezz aa4d373212 Attempted fix for building with Havok_TPV 2025-11-18 10:50:53 +10:00
Hecklezz 31b81b2c05 Corrected spacing and use of tab instead of spaces 2025-10-19 01:27:57 +10:00
Hecklezz b456ae2dc7 Fixed crash relating to looking for the wrong .xib resource file for MacOS 2025-10-17 15:26:25 +10:00
Hecklezz 2d9b26a648 Fix compilation errors when building without Havok 2025-10-17 15:25:04 +10:00
Hecklezz 27fe962a3a Merge remote-tracking branch 'upstream/release/2025.07' 2025-10-17 15:20:58 +10:00
Ansariel 98a48cf1c1 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/pipeline.cpp
2025-10-11 14:35:54 +02:00
Brad Linden 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
Brad Linden 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
Brad Linden fc41f57a06 Attempt to fix build error 2025-10-02 11:26:48 -07:00
Brad Linden b8cf54d909 Fix configurations like windows where LLPHYSICSEXTENSIONS_STUB_DIR is unset 2025-10-01 18:17:16 -07:00
Brad Linden 589498fece Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64 2025-10-01 18:01:19 -07:00
Angeldark Raymaker 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
Ansariel 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
Rye 8f43b5b77b Fix macos build arch and deploy target due to cmake behavior changes 2025-09-05 19:35:22 -04: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
Rye 34ae3db498 Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac 2025-08-27 23:07:22 -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
Ansariel 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
Callum Linden 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
Rye ba30737d8f Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac 2025-08-20 18:04:55 -04:00
Ansariel 9c73af6e2a Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/CMakeLists.txt
2025-08-14 20:30:27 +02:00
Ansariel 6491cb0307 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506 2025-08-14 20:08:01 +02:00
Brad Linden 4c65a43e17
CMake 4.10 compatibility fixes (#4548) 2025-08-14 09:47:22 -07:00
Andrey Kleshchev 6f072c2121
Merge 2025.06 into develop
Merge 2025.06 into develop
2025-08-14 11:17:35 +03:00
Ansariel 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
Signal Linden 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
Ansariel 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
Ansariel c43b544dc6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202505 2025-08-06 18:26:27 +02:00
Andrey Kleshchev ce9d66cdd1 Merge branch develop into 2025.06
# Conflicts:
#	indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
Andrey Kleshchev acc8928330
Merge release/2025.05 into develop 2025-08-06 14:17:18 +03:00
Ansariel 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
Andrey Kleshchev 61d53a8731 #4470 Plug in Discord SDK package 2025-08-05 18:26:29 +03:00
Ansariel 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
Erik Kundiman afcc64cb07
Rich Presence support using Discord Social SDK (#4457)
* Rich Presence support using Discord Social SDK

Download DiscordSocialSdk-1.4.9649.zip from
https://discord.com/developers/applications/1394782217405862001/social-sdk/downloads
Add -DUSE_DISCORD:BOOL=ON to your cmake line.
The Discord app needs to be set to be a public client in the OAuth2 tab.
All Discord-related code are contained within one file, llstartup.cpp,
and other classes access it through some opaque layer, static functions,
otherwise we'd get these "duplicate symbol" linking errors.

* Move Discord-related code to llappviewer.cpp

The doFrame is the one called over and over again, so running the
Discord callbacks from there shouldn't have one extra function
overhead, while running the Discord initialisation is only once so
it's much more okay to have the extra function overhead there.

* panel_preferences_privacy tabs

Add tab and checkboxes for discord social SDK integration options to panel_preferences_privacy.xml

* Shorten Discord-related local variable names

* Connect to Discord now through privacy tab

Now the access token is saved the way passwords are saved, but
without a username, so we can have some persistence without having
to implement an OAuth2 backend server cause we would have to store
those tokens there anyway still, and it's just simpler to not go
that way. Discord Social SDK doesn't have a helper for sending code
to a custom server anyway, that we would have to have some
asynchronous HTTP requestor ready.
Show location check button gets enabled only when Discord
integration is enabled, though it's not functioning yet.

* Location for Discord Rich Presence Activity State

I was going to use LLAgentUI::buildLocationString but there's no
location format that shows only region and coords without having
to have the parcel name empty, so I copied buildLocationString
implementation in the case of LOCATION_FORMAT_NO_MATURITY but when
the parcel name is empty.
I had to make updateDiscordActivity check agent's ID and the
existence of agent avatar pointer first before trying to set
Activity Details or State, cause I like the "Show location" button
be checkable not only after online when both the ID & pointer will
have existed. I think this way is simpler than programmatically
enabling the "Show location" button after the user is logged in.
I put a trigger to Activity update somewhere after the user is
logged in for now, not yet after a TP.
The elapsed time gets reset whenever Activity is updated for now,
but I'll try to make elapsed time extended instead.
No Party for now, because I couldn't find a way to make a Party
shown without showing its CurrentSize (I could still get away not
showing its MaxSize by setting it to 0), so the State (location)
is shown above the elapsed time, not on the right of it.
I'll try to figure out to get some representative numbers for its
CurrentSize & MaxSize next.
Also no privacy on hiding the username for now, until the UI is
ready.

* Update Rich Presence location on region change

I had to find a spot in source code where it doesn't cause a crash
(it did in LLAgent::setRegion), but I'm not removing the one in
llstartup.cpp because on login, the one in llviewermessage.cpp
gets only the placeholder coords (10, 10, 10).

* Show display name too on Discord Rich Presence

Avatar name cache can be used right away upon login now after I
moved the update call to the end of PRECACHE section in llstartup.

* Show Discord Rich Presence Activity Party

By setting CurrentSize to the number of people within chat radius,
and MaxSize to the number of people within near range.

* Call updateDiscordActivity too in Discord init

so when the user enables the integration after being logged in,
the init can show the name and location right away.

* Discord Rich Presence: Hide name & connect to llappviewer.cpp

Add option to show/hide avatar name in privacy panel & connect rich presense directly to llappviewer.cpp

* Discord time elapsed not reset on region change

Time elapses right after viewer launch even before login.
Plus parameter name change in header to make it the same as in
implementation.

* Cache bool setting retrievals in updateDiscordActivity

As suggested by Andrey Kleschev.
getBOOL and getF32 are expensive, so using `static LLCachedControl<>`
is the way to do it in llappviewer.cpp.

* Check Discord creds existence before getting token

as suggested by Andrey Kleshchev, anticipating external factors
such as user moving settings from another PC.

* Tracy visibility for looped Discord function calls

As suggested by Andrey Kleshchev. They likely can get pricey so
they need to be visible in the profiler.

* Discord-related error handling/logging

plus delay saving Discord credentials to only after the access
token is successfully updated on Discord, and try to disconnect
from Discord when the integration gets disabled regardless whether
there are credentials to delete or not and whether there's an
access token to revoke or not.

* Use getAvatars already called for Discord Party numbers

so we don't have to make any extra getAvatars calls just for this,
as it's pricy in crowds, and we'll just be piggybacking
`updateSpeakerList` and `updateNearbyList`.

* Assemble Discord Activity Details only once

by saving it to a static global string for reuse.

* Remove updateDiscordActivity call in startup loop

The State field (region & coords) is updated well enough without it
now.

* Rename handleDiscordSocial to toggleDiscordIntegration

* Update Discord Activity only when integration is enabled

No need to check setting for the status change callback one,
because getting there would need to be connected to Discord first,
which in turn needs the integration to be enabled first.

---------

Co-authored-by: Secret Foxtail <remmy@megapahit.net>
2025-07-31 08:54:39 -07:00
Ansariel a4e8af0dce Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/pull_request_template.md
#	CONTRIBUTING.md
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/llstatusbar.cpp
#	indra/newview/llstatusbar.h
#	indra/newview/res/viewerRes.rc
#	indra/newview/skins/default/xui/de/panel_login_first.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_login_first.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
#	indra/newview/skins/default/xui/en/panel_status_bar.xml
#	indra/newview/skins/default/xui/es/panel_login_first.xml
#	indra/newview/skins/default/xui/fr/panel_login_first.xml
#	indra/newview/skins/default/xui/it/panel_login_first.xml
#	indra/newview/skins/default/xui/ja/panel_login_first.xml
#	indra/newview/skins/default/xui/pl/panel_login_first.xml
#	indra/newview/skins/default/xui/pt/panel_login_first.xml
#	indra/newview/skins/default/xui/ru/panel_login_first.xml
#	indra/newview/skins/default/xui/tr/panel_login_first.xml
#	indra/newview/skins/default/xui/zh/panel_login_first.xml
#	indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02:00
Maxim Nikolenko 5291fc252a
#4374 update icon for title bar 2025-07-26 01:20:22 +03:00
Jonathan "Geenz" Goodman af507ce246 Merge branch 'main' into release/2025.05 2025-07-25 18:05:53 -04:00
Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/pull_request_template.md
#	indra/llappearance/lltexlayer.cpp
#	indra/llcommon/llthread.cpp
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lltoolpie.cpp
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
Ansariel 7d03d5af2a Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-07-09 22:50:15 +02:00
Jonathan "Geenz" Goodman b0c951ffe3
Revert "Merge develop into glTF mesh import" 2025-06-27 21:28:58 -04:00
Ansariel f82e171a30 Merge branch 'release/2025.04.1' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/commands.xml
#	indra/newview/llfloateravatarwelcomepack.cpp
#	indra/newview/llfloateravatarwelcomepack.h
#	indra/newview/llstartup.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/strings.xml
2025-06-13 19:39:16 +02:00
Ansariel 4cfdea8395 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/zh/strings.xml
2025-06-07 17:50:44 +02:00
Callum Prentice 8d3d6ee56a Remove the old avatar selector (Complete Avatars) - replaced by Avatar Welcome Pack 2025-06-03 19:24:04 -07:00
Callum Prentice d8db0ff30c First commit - bare bones of it working - pointing to test page on S3 2025-06-03 17:50:15 -07:00