Commit Graph

50092 Commits (741b79d63b97bb5e43f758fd93854317f0bdc65f)

Author SHA1 Message Date
Andrey Kleshchev 741b79d63b viewer#1529 Mesh Uploader should permit lowering material count 2024-05-22 11:10:17 +03:00
Andrey Lihatskiy e8de17d6a6
Merge pull request #1507 from secondlife/marchcat/c-merge
Main -> Maint C sync
2024-05-17 19:05:26 +03:00
Andrey Lihatskiy 0b46cef0e0 Merge branch 'main' into marchcat/c-merge 2024-05-17 18:59:16 +03:00
Brad Linden e1623bb276
Merge pull request #1489 from secondlife/brad/fix-mac-channel
Fix channel detection for mac builds
2024-05-16 09:55:50 -07:00
nat-goodspeed da46958824
Merge pull request #1486 from secondlife/brad/workflow-dispatch-release
Experiment with getting manually triggered workflow builds to optionally do a release
2024-05-16 10:06:05 -04:00
Andrey Lihatskiy dfdd84e44b Update threejs to use the platform agnostic package 2024-05-16 17:00:21 +03:00
nat-goodspeed 5e294f6689
Merge pull request #1462 from secondlife/nat/releaseos
Run ReleaseOS builds, but only when a release page is requested.
2024-05-16 09:52:41 -04:00
Alexander Gavriliuk 2f600d8ad6 secondlife/jira-archive-internal#71144 Mouselook no longer allows pitch upwards to full 90 degrees 2024-05-16 14:37:16 +02:00
Brad Linden 8011d3f457 Fix channel detection for mac builds 2024-05-15 16:08:04 -07:00
Brad Linden 7feec9998e Move all release_run logic into setvar job. 2024-05-15 15:12:52 -07:00
Brad Linden 0960ae7892 Experiment with getting manually triggered workflow builds to optionally do a release 2024-05-15 14:49:07 -07:00
Nat Goodspeed 1f0b80f709 Streamline the new workflow `RELEASE_RUN` logic a little.
Since downstream jobs reference the output of the new `setvar` job, instead of
directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in
the global environment.
2024-05-15 17:15:25 -04:00
Nat Goodspeed 2e144ecbb2 Merge branch 'main' into nat/releaseos following Maint X promotion 2024-05-15 16:17:09 -04:00
Nat Goodspeed 1b5f0590ce Merge commit 'e7eced3' into nat/releaseos for whitespace fix. 2024-05-15 16:15:46 -04:00
Nat Goodspeed f822193974 Make env.RELEASE_RUN the empty string if false
not the string "false", which is true.
2024-05-15 16:08:54 -04:00
Nat Goodspeed 18c1458409 Can't reference global env in job.if either. 2024-05-15 16:01:26 -04:00
Nat Goodspeed 9d30040dfe Try to work around workflow YAML env setting limitation. 2024-05-15 15:57:50 -04:00
Andrey Lihatskiy 33ad8db775 #1457 Fix the tests on mac
(cherry picked from commit 82d7137825)
2024-05-15 09:35:28 -04:00
Andrey Lihatskiy 4ddaeb3772
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C merge
2024-05-15 15:27:36 +03:00
Andrey Lihatskiy 363b89947c Mac build fix 2024-05-15 13:43:59 +03:00
Andrey Lihatskiy ee05a06360 Merge branch 'release/maint-x' into marchcat/x-c-merge
to pick up mac build fixes
2024-05-15 12:29:32 +03:00
Andrey Lihatskiy e592164436 Merge branch 'main' into release/maint-c
# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp
2024-05-15 12:27:46 +03:00
Andrey Lihatskiy dcb85f9f9d Merge branch 'marchcat/w-whitespace' into release/maint-c 2024-05-15 12:07:29 +03:00
Nat Goodspeed bb3c36f5cb Increment viewer version to 7.1.8
following promotion of secondlife/viewer #705: Maintenance X
2024-05-14 21:34:34 -04:00
Nat Goodspeed 094dcc07f8 Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X 2024-05-14 21:02:28 -04:00
Andrey Lihatskiy 82d7137825 #1457 Fix the tests on mac 2024-05-14 11:24:35 +03:00
Andrey Lihatskiy 2c52f6e323 #1457 Temporarily disable the tests to unblock Maint X builds
This reverts commit 4329e95379.
2024-05-14 11:24:35 +03:00
Nat Goodspeed a4d2574df2 Run ReleaseOS builds, but only when a release page is requested. 2024-05-13 13:46:42 -04:00
Andrey Kleshchev d5378e9cab viewer-private#236 Don't block removal of marketplace folders
Marketplace is not visible outside of own floater and that floater will
do an extra warning when deleting listings that have additional data.
2024-05-13 17:30:25 +03:00
Andrey Lihatskiy e316f5cff9 Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
#	autobuild.xml
2024-05-13 17:29:07 +03:00
Andrey Lihatskiy 9013267da2
Merge pull request #1373 from secondlife/marchcat/x-ws-merge 2024-05-13 17:06:17 +03:00
Nat Goodspeed 4f70946048 Fix syntax error in build.yaml to enable Windows ReleaseOS 2024-05-11 10:14:49 -04:00
Nat Goodspeed afd726979a Turn on GH Windows ReleaseOS build 2024-05-11 09:58:22 -04:00
nat-goodspeed d4043d3b01
Merge pull request #1444 from secondlife/nat/slvoice
Update to S3-published GHA build of slvoice.
2024-05-10 11:02:57 -04:00
Nat Goodspeed 85af619bbb Reapply slvoice package URLs with autobuild 3.9.5 2024-05-10 09:10:18 -04:00
Nat Goodspeed 9deeec22b7 Bump up coroutine stack size: saw C00000FD test termination.
(cherry picked from commit dc0b3aed4782e4e4835fd6b9d59d1d70b78be4a7)
2024-05-09 15:36:48 -04:00
Nat Goodspeed 692a5eb2d3 Remove `creds=github` from slvoice platform entries.
https://github.com/secondlife/autobuild/issues/46

Also remove temporary `continue-on-error` setting.
2024-05-09 11:12:18 -04:00
Nat Goodspeed 442cc12d4d Build both platforms on GitHub to help diagnose slvoice URL trouble. 2024-05-08 09:38:50 -04:00
Andrey Kleshchev 26f70456d1 viewer#1195 Don't allow Bake textures as group images 2024-05-07 02:43:35 +03:00
Nat Goodspeed 3c023813dc Update to S3-published GHA build of slvoice. 2024-05-06 12:34:41 -04:00
nat-goodspeed 10aa7f4254
Merge pull request #1391 from secondlife/with-tests
Turn on LL_TESTS for CI builds.
2024-05-02 17:34:34 -04:00
nat-goodspeed 2c1647e84c
Merge pull request #1389 from secondlife/brad/fix-gltfmaterial-tests
brad/fix gltfmaterial tests
2024-05-02 14:44:33 -04:00
Brad Linden 8d5372577c Update LLGLTFMaterial tests for changes introduced in SL-20523
also correct member packing to match server side
2024-05-02 10:54:15 -07:00
Maxim Nikolenko d738aa7d64
pviewer#235 slurl command should require at least click action 2024-05-02 18:36:29 +03:00
Vir Linden 079c6ab9af
Merge pull request #1376 from secondlife/project/channel_by_branch
Project/channel by branch
2024-05-02 11:01:11 -04:00
Vir Linden 6eeef10cda
Update build.yaml 2024-05-02 10:08:46 -04:00
Vir Linden eb0f963b46
Update build.yaml 2024-05-02 09:48:26 -04:00
Nat Goodspeed 4329e95379 Turn on LL_TESTS for CI builds. 2024-05-02 09:14:55 -04:00
Alexander Gavriliuk faefd35163 secondlife/viewer#1330 EmojiPicker inserts emoji to inactive chat floater 2024-05-02 03:39:35 +02:00
Alexander Gavriliuk 18f23d9a55 secondlife/viewer#1360 Avoid of using avatar full names 2024-05-02 02:14:21 +02:00