bdb8caf790
Merge branch 'release/materials_featurette' into marchcat/x-mf-merge
2024-05-16 00:10:29 +03:00
29be88d60d
#1267 Fix for alpha cutoff of zero and base color factor alpha of zero making objects disappear ( #1485 )
2024-05-15 15:40:55 -05:00
43603fedba
jira-archive-internal#67837 Windows' bulk export of snapshots and textures
...
Properly sanitize names
Better duplicate avoidance
2024-05-15 23:36:29 +03:00
2e144ecbb2
Merge branch 'main' into nat/releaseos following Maint X promotion
2024-05-15 16:17:09 -04:00
1b5f0590ce
Merge commit 'e7eced3' into nat/releaseos for whitespace fix.
2024-05-15 16:15:46 -04:00
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
18c1458409
Can't reference global env in job.if either.
2024-05-15 16:01:26 -04:00
9d30040dfe
Try to work around workflow YAML env setting limitation.
2024-05-15 15:57:50 -04:00
bbc9d9db48
#1466 Loosen clamp on haze glow to fix skies that want to be bonkers ( #1470 )
2024-05-15 14:15:55 -05:00
a266a4356f
secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working as expected
2024-05-15 20:50:59 +02:00
1cca0d7c69
Merge pull request #1482 from secondlife/v-1474
...
secondlife/viewer#1474 : Remove small texture offset from PBR terrain
2024-05-15 10:09:39 -07:00
ae6a402b7a
secondlife/viewer#1474 : Remove small texture offset from PBR terrain
2024-05-15 09:55:55 -07:00
33ad8db775
#1457 Fix the tests on mac
...
(cherry picked from commit 82d7137825
2024-05-15 09:35:28 -04:00
c8217c156a
Merge branch 'release/maint-x' into marchcat/x-mf-merge
2024-05-15 12:51:50 +03:00
d9153532b8
Merge branch 'main' into marchcat/x-mf-merge
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
bf1235b017
Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-merge
2024-05-15 12:46:26 +03:00
fb17c00f14
triage#49 Menu didn't work for already selected items
2024-05-15 11:25:57 +03:00
bb3c36f5cb
Increment viewer version to 7.1.8
...
following promotion of secondlife/viewer #705 : Maintenance X
2024-05-14 21:34:34 -04:00
094dcc07f8
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705 : Maintenance X
2024-05-14 21:02:28 -04:00
904f5b2ac3
Merge pull request #1473 from secondlife/brad/gltf-dev-mac-shader-fix
...
brad/mac shader fix
2024-05-14 14:23:11 -07:00
124c58901d
Fix shader error on mac: 'Redeclaration of sized array 'terrain_texcoord' not allowed'
2024-05-14 14:13:40 -07:00
1c2cf6a0f7
Merge branch 'brad/gltf-dev-merge-main-and-featurettes' into project/gltf_development
2024-05-14 13:56:06 -07:00
7bfb29687c
Merge pull request #1446 from Ansariel/project/gltf_development
...
Fix broken merge and BOOL/bool issues
2024-05-14 14:24:21 -05:00
d21f29b643
Merge branch 'project/gltf_development' into project/gltf_development
2024-05-14 14:22:46 -05:00
31a3423239
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-05-14 11:07:13 -07:00
193d9d5f76
Merge pull request #1453 from secondlife/v-907
...
secondlife/viewer#907 : Local PBR terrain texture transform in advanced settings
2024-05-14 10:11:52 -07:00
1e9e5a7b76
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-05-14 09:42:24 -07:00
82d7137825
#1457 Fix the tests on mac
2024-05-14 11:24:35 +03:00
2c52f6e323
#1457 Temporarily disable the tests to unblock Maint X builds
...
This reverts commit 4329e95379
2024-05-14 11:24:35 +03:00
57b99aec74
Don't overwrite voice channel's credentials when retrieving the channel.
2024-05-13 18:40:00 -07:00
87c889b370
secondlife/viewer#907 : Fix LLGLTFMaterial tests
2024-05-13 18:10:54 -07:00
cdcfbab5c4
secondlife/viewer#907 : Fix bad merge in LLGLTFMaterial
...
Caused by a conflict between the LLGLTFMaterial::getHash fix, and an improvement in LLGLTFMaterial field ordering for platform-dependent memory reduction.
2024-05-13 15:33:14 -07:00
39d24e90b9
incoming p2p sessions for webrtc may not have names yet.
2024-05-13 12:36:07 -07:00
2008f87f10
Revert "viewer#819 Avoid reading the same XML file multiple times"
...
This reverts commit a865d42397
2024-05-13 21:25:58 +03:00
a4d2574df2
Run ReleaseOS builds, but only when a release page is requested.
2024-05-13 13:46:42 -04:00
942ff2cd8b
Merge pull request #1460 from secondlife/DRTVWR-600-maint-A
...
viewer#1420 Fixed names not showing in Chat
2024-05-13 10:43:05 -05:00
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
e316f5cff9
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# autobuild.xml
2024-05-13 17:29:07 +03:00
9013267da2
Merge pull request #1373 from secondlife/marchcat/x-ws-merge
2024-05-13 17:06:17 +03:00
4f70946048
Fix syntax error in build.yaml to enable Windows ReleaseOS
2024-05-11 10:14:49 -04:00
afd726979a
Turn on GH Windows ReleaseOS build
2024-05-11 09:58:22 -04:00
9441608623
secondlife/viewer#907 : Local PBR terrain texture transforms
2024-05-10 17:42:54 -07:00
27e4913b5c
Fix issue where groups/adhoc chats were named with the initiators display name
2024-05-10 09:36:38 -07:00
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
799ebf2162
Fix broken merge and BOOL/bool issues
2024-05-10 15:16:06 +02:00
85af619bbb
Reapply slvoice package URLs with autobuild 3.9.5
2024-05-10 09:10:18 -04:00
9deeec22b7
Bump up coroutine stack size: saw C00000FD test termination.
...
(cherry picked from commit dc0b3aed4782e4e4835fd6b9d59d1d70b78be4a7)
2024-05-09 15:36:48 -04:00
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
be19e495c5
Merge pull request #1440 from secondlife/roxie/webrtc-voice
2024-05-08 17:41:46 -07:00
Andrey Lihatskiy