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
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
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
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
6a43bbd7b2
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-05-08 13:59:32 -07:00
54816bdf81
Fix for mirrors not functioning properly under water. ( #1436 )
...
* #1165 Fix for clipping and culling for mirrors under water.
2024-05-08 13:40:58 -07:00
ca5e89d741
Even more mirror fixes. ( #1429 )
...
#1271 Add support for mirrors that do not have avatars in them. It does this based on if the probe is set to dynamic or not.
#1370 More optimization work to reduce GPU utilization.
#1058 - Removed sim feature flag that was overriding mirrors enabled flags
secondlife/viewer-private#128 - Locally cache the mirror probe
#679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-08 11:28:51 -07:00
442cc12d4d
Build both platforms on GitHub to help diagnose slvoice URL trouble.
2024-05-08 09:38:50 -04:00
ad64251739
viewer#1420 Fixed names not showing in Chat
...
Save node prior to calling updateDefault
2024-05-08 00:56:41 +03:00
155ddf2336
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
...
Drtvwr 600 maint a
2024-05-07 09:47:37 -05:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
15d4db0b5d
openal @rpath fix
2024-05-07 08:25:49 +03:00
b31dad179a
viewer#799 Account for renderTarget
2024-05-07 08:25:13 +03:00
a156998fa6
viewer#799 Account for reflection probes' memory
2024-05-07 08:25:13 +03:00
ea268fcd48
viewer#799 getAvailableVRAMMegabytes cleanup
2024-05-07 08:25:13 +03:00
f79548ec68
Merge remote-tracking branch 'origin/main' into project/gltf_development
2024-05-06 17:33:46 -07:00
84827a7cb8
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
...
Merge Maint A to development
2024-05-06 15:44:19 -07:00
8b747cee18
BOOL to bool
2024-05-06 16:49:24 -05:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
3c023813dc
Update to S3-published GHA build of slvoice.
2024-05-06 12:34:41 -04:00
76101843c0
Merge pull request #1399 from secondlife/release/materials_featurette
...
#1382 Fix for scrubbing occlusion channel of ORM map (#1383 )
2024-05-03 10:16:14 -05:00
10aa7f4254
Merge pull request #1391 from secondlife/with-tests
...
Turn on LL_TESTS for CI builds.
2024-05-02 17:34:34 -04:00
Andrey Lihatskiy