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
bbc2ad8fc5
Merge remote-tracking branch 'origin/main' into geenz/main-to-develop
2025-10-17 17:06:39 -04:00
27fe962a3a
Merge remote-tracking branch 'upstream/release/2025.07'
2025-10-17 15:20:58 +10:00
ad374a0176
#4701 Fix incorrect architecture in package's name
2025-10-16 23:20:14 +03:00
c440843513
disable package_llphysicsextensions_tpv for now
2025-10-03 11:39:57 -07:00
589498fece
Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64
2025-10-01 18:01:19 -07: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
5ffcd3dc88
Fixes for GHA build
2025-08-28 17:58:33 -04:00
77d71dec86
Fix up universal build
2025-08-28 00:43:38 -04:00
193fb1627f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermedia.cpp
2024-09-19 23:04:19 +02:00
b589d394be
remove dead code in build.sh
2024-09-19 12:02:57 -07:00
028933621e
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
...
# Conflicts:
# indra/llui/llscrolllistctrl.cpp
2024-08-10 13:57:24 +02:00
25b7fd4fa9
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/CMakeLists.txt
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicewebrtc.cpp
2024-08-10 13:04:14 +02:00
b35e4d26d1
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/lleventpoll.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoicewebrtc.cpp
2024-08-10 12:51:51 +02:00
c106221726
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
...
# Conflicts:
# .github/workflows/build.yaml
# indra/llui/llscrolllistctrl.cpp
2024-08-09 15:43:06 -07:00
e0737b1423
misnamed file
2024-08-07 15:11:03 -07:00
63a4ad9b98
Add Windows multi-pdb upload capability
2024-08-07 14:16:11 -07:00
b6cd0cd7d0
misspelled xcarchive
2024-08-06 19:43:26 -07:00
ece9cb8022
Build an xcarchive for mac symbol upload.
2024-08-06 18:41:46 -07:00
946b165b99
Missed file
2024-08-05 21:34:52 -07:00
e96416bdd2
missing quotes
2024-08-05 19:25:59 -07:00
293187e04b
Build mac symbols for multiple binaries/dynamic libraries and upload them all to bugsplat
2024-08-05 18:17:03 -07:00
04bed35215
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwebrtc/llwebrtc.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2024-08-02 13:01:06 +02:00
dfa7d60a72
build.yaml: Fix FROM_FORK value, ReleaseOS PR builds ( #2147 )
2024-07-30 10:09:49 -07:00
591c75ebaf
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
a0b3021bdc
Trim trailing whitespace
...
Start trimming trailing whitespace, but limit the blast radius to a
handful of file types.
2024-05-29 08:10:00 -07:00
8d5d9a7e59
Merge branch 'main' of https://github.com/secondlife/viewer
2024-05-03 13:32:06 +02:00
4329e95379
Turn on LL_TESTS for CI builds.
2024-05-02 09:14:55 -04:00
2c52b8b243
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/CMakeLists.txt
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/viewer_manifest.py
2024-04-24 16:27:23 +02:00
0f94ea86d4
CI: adopt xz compression
...
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-11 15:18:42 -07:00
c070f23547
Merge pull request #1095 from secondlife/signal/rm-buildparams
...
Remove BuildParams
2024-04-11 11:32:12 -07:00
2b1e372f76
Remove BuildParams
...
This file is no longer used.
2024-03-30 21:21:55 -07:00
cbf6aca2e8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 10:35:43 +01:00
1f75fbd3b5
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llviewerwindow.cpp
2024-03-26 22:43:42 +01:00
091ee67ec5
Merge branch 'main' into DRTVWR-588-maint-W
2024-03-09 19:46:09 +02:00
041c66d59a
Stop requiring BUGSPLAT_USER and BUGSPLAT_PASS in build.sh.
...
The build step no longer needs these variables at all: they're used in a
subsequent workflow job.
2024-03-05 14:29:24 -05:00
04d32cf7eb
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/panel_profile_pick.xml
# indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2024-01-26 14:29:44 +01:00
6a206b1a61
SL-20546: Allow running build.sh even without GITHUB_OUTPUT set.
...
Default it to /dev/null, so output to $GITHUB_OUTPUT is permitted but
discarded.
2023-11-15 09:45:10 -05:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
1570153a84
SL-18837: build.sh shouldn't even check for an installer.
...
We no longer package the installer before this point, and we want to upload
symbol files even so.
2023-10-04 19:40:46 -04:00
89191059ef
SL-18837: Upload symbol file and physics pkg without installer.
...
build.sh logic used to test whether the installer existed and skip the
symbol-file and llphysicsextensions uploads if not. Since we now sign and
package the built viewer in a later build job, it's no longer appropriate to
gate these uploads on existence of the installer.
2023-10-04 16:54:07 -04:00
1684d62499
SL-19242: Remove signing and packaging from viewer_manifest.py
...
for Mac and Windows. That's now done by subsequent jobs in the GitHub build.
Remove workflow step to upload installers before signing and packaging jobs.
Remove from viewer_manifest.py conditionals for 32-bit Windows or Mac.
Also bump to actions/checkout@v4, per dependabot.
2023-10-03 19:02:40 -04:00
fab7b300b9
SL-19242: Re-enable the rest of the build product uploads.
2023-09-11 15:34:14 -04:00
63d5d38e36
SL-18837: Stop failing build.sh if there's no installer.
...
This unblocks ReleaseOS builds, and also preps for SL-19242.
Streamline build.sh's Uploads section.
2023-09-08 17:24:04 -04:00
5bf2317bd8
SL-19243: Skip older Mac symbol upload
...
because it moves the xcarchive.zip file away from where we later want to post
it to GitHub.
2023-09-02 12:19:26 -04:00
3eea556c28
SL-19243: Post xcarchive.zip instead of separate symbols tarball.
...
On Mac, in the CMake USE_BUGSPLAT logic, we created both xcarchive.zip (which
is what BugSplat wants to see) and secondlife-symbols-darwin -64.tar.bz2 (which
we don't think is used for anything). The tarball was posted to codeticket --
but why? If the point is to manually re-upload to BugSplat in case of failure,
we'll do better saving xcarchive.zip to codeticket.
For SL-19243, posting xcarchive.zip directly supports the goal of breaking out
the upload to BugSplat as a separate step.
Anyway, since xcarchive.zip is a superset of the tarball, the tarball can be
recreated from the zip file, whereas the zip file can't be recreated from the
tarball without opening the .dmg installer and extracting the viewer executable.
If the xcarchive.zip file exists (that is, on Mac), post that to codeticket or
GitHub, as applicable, instead of the tarball. In fact, in the USE_BUGSPLAT
case, don't even bother creating the tarball since we're going to ignore it.
Make the new build.sh logic that insists on BUGSPLAT_USER and BUGSPLAT_PASS
conditional on BUGSPLAT_DB.
2023-09-02 11:02:23 -04:00
bfb059d4ff
SL-19243: Try harder to list contents of xcarchive.zip.
...
upload-mac-symbols.sh actually moves the xcarchive.zip file to /tmp, which is
why we couldn't find it when trying to list its contents after the upload.
2023-09-01 15:28:36 -04:00
1f6213a584
SL-19243: Try to list contents of xcarchive.zip
2023-09-01 12:58:53 -04:00
e8cd5205e8
SL-19243: Try to run Windows BugSplat uploads as a separate GH job.
...
Upload a new Windows-exe artifact containing just the executable (needed by
BugSplat) separately from the artifact containing the whole NSIS installer.
This requires a new viewer_exe step output set by viewer_manifest.py.
Define viewer_channel and viewer_version as build job outputs.
Set viewer_channel in build.yaml when tag is interpreted.
Set viewer_version in build.sh at the point when it would have posted
viewer_version.txt to codeticket.
Add a post-windows-symbols job dependent on the build job that engages
secondlife/viewer-post-bugsplat-windows, which in turn engages
secondlife/post-bugsplat-windows. We keep the actual upload code in a separate
repo in case we need to modify that code before rerunning to resolve upload
errors. If we kept the upload code in the viewer repo itself, rerunning the
upload with modifications would necessarily require rerunning the viewer
build, which would defeat the purpose of SL-19243.
Because of that new upload job in build.yaml, skip Windows symbol uploads
in build.sh.
Use a simple (platform name) artifact name for metadata because of
flatten_files.py's filename collision resolution.
Use hyphens, not spaces, in remaining artifact names: apparently
download-artifact doesn't much like artifacts with spaces in their names.
Only run the release job when in fact there's a tag. Without that, we get
errors. We need not create flatten_files.py's output directory beforehand
because it will do that implicitly.
2023-08-31 15:53:56 -04:00
b449667d8d
SL-19854: Ensure BugSplat credentials are exported.
2023-07-18 16:19:19 -04:00
Ansariel