2c1647e84c
Merge pull request #1389 from secondlife/brad/fix-gltfmaterial-tests
...
brad/fix gltfmaterial tests
2024-05-02 14:44:33 -04:00
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
37972cb76c
Merge pull request #1371 from secondlife/1357-gltf-asset-prototype
...
#1357 GLTF Export Prototype
2024-05-02 10:31:52 -07:00
e8219cb050
Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype
2024-05-02 10:59:29 -05:00
7fc5f7e649
#1354 Make coroutines use LLCoros::Mutex instead of LLMutex ( #1356 )
...
* #1354 Make coroutines use LLCoros::Mutex instead of LLMutex
* #1354 Fix some more unsafe coroutine executions.
* #1354 Implement changes requested by Nat
2024-05-02 10:57:39 -05:00
079c6ab9af
Merge pull request #1376 from secondlife/project/channel_by_branch
...
Project/channel by branch
2024-05-02 11:01:11 -04:00
6eeef10cda
Update build.yaml
2024-05-02 10:08:46 -04:00
eb0f963b46
Update build.yaml
2024-05-02 09:48:26 -04:00
4329e95379
Turn on LL_TESTS for CI builds.
2024-05-02 09:14:55 -04:00
0cb2c511bc
Merge pull request #1374 from secondlife/signal/editorconfig
...
Add editorconfig
2024-05-01 12:49:19 -07:00
812e2cda54
#1382 Fix for scrubbing occlusion channel of ORM map ( #1383 )
2024-05-01 14:37:50 -05:00
7f23f160d7
trim trailing whitespace
2024-05-01 17:51:44 +01:00
65495ba765
set viewer channel from branch
2024-05-01 16:42:09 +01:00
ab85470985
Merge branch 'main' into project/channel_by_branch
2024-05-01 16:32:46 +01:00
c785a0e955
Add editorconfig
...
Provide a basic editorconfig file with this repository's defaults.
2024-05-01 08:23:35 -07:00
a701cce8e0
#1357 Preserve asset "extras" and switch to std::shared_ptr for referencing Asset from LLViewerObject to cut down rebuild time
2024-05-01 09:51:32 -05:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
e7eced3c87
#824 Don't fix tabs in files with no tabs
2024-05-01 07:58:22 +03:00
d48497268e
#824 Add c,py,glsl to the script's default file types
2024-05-01 07:39:56 +03:00
170765fd35
#1357 Proof of concept on decomposing a GLTF scene into its component parts
2024-04-30 21:57:42 -05:00
9b6979f458
Fix for SL-20652 shadows on mac breaking alpha blended objects. ( #1264 )
...
* Fix for SL-20652 shadows on mac breaking alpha blended objects.
fix secondlife/jira-archive-internal#71030
* clean up surrounding indentation
* Skip unnecessary casting
* Clean up LLGLSLShader::sIndexedTextureChannels usage and improve fix for SL-20652
2024-04-30 19:06:27 -05:00
1514edc58a
Fix for black moon. ( #1369 )
2024-04-30 18:01:13 -05:00
f108e716fc
Merge pull request #1341 from secondlife/vp-230
...
secondlife/viewer-private#230 : Amend terrain loading test plan
2024-04-30 15:32:46 -07:00
5e2bac01cb
#1357 GLTF Export Prototype
2024-04-30 17:26:48 -05:00
633fa78426
Update terrain_loading.md
...
Add more details to Behavior overview.
2024-04-30 15:22:58 -07:00
9bf2dfbb39
Use s3 hosted slvoice autobuild dependencies
...
Pull SLVoice from s3 so that the OSS build configurations work.
2024-04-29 23:51:02 +03:00
0907fdd926
Adapt llimageworker_test for updated virtual method API.
...
This was a broken test that got all the way to viewer release and the main
branch.
(cherry picked from commit a33a9d29380e6c1a0a9cc539be309d47adef4acf)
2024-04-29 23:51:02 +03:00
66ccc1ed83
#886 Fix for crash in LLBumpImageList when connecting to a simulator with different feature flags ( #1345 )
2024-04-29 10:40:42 -07:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
af4ea94efc
#824 Add a script to convert tabs to spaces in the code files
2024-04-29 07:06:48 +03:00
a6c89d9185
#824 Add indent_with_spaces hook for source files
2024-04-29 06:55:13 +03:00
7d87e41bbd
secondlife/viewer#1331 The animation with null id is attempted to fetch
2024-04-28 18:27:50 +02:00
08e012b4fa
secondlife/viewer-private#230 : Amend terrain loading test plan
2024-04-26 12:10:38 -07:00
8465a8acb2
#1325 Fix for GLTF overrides sometimes not showing up. ( #1340 )
2024-04-26 13:38:30 -05:00
6f51d909a2
Merge pull request #1337 from secondlife/v-1184
...
Cached minimap textures still using extra memory/loading still not reliable
2024-04-26 09:27:27 -07:00
668c63c2c4
secondlife/viewer#1184 : Remove logspam
2024-04-26 09:25:08 -07:00
19c0504671
secondlife/viewer#1184 : Fix mac build
2024-04-25 17:33:02 -07:00
df40c005ae
secondlife/viewer#1184 : Discourage use of forceToRefetchTexture
2024-04-25 16:51:14 -07:00
aac18ada71
secondlife/viewer#1184 : Use more robust/memory-friendly setLoadedCallback for minimap gen. Fix some emissive maps.
2024-04-25 16:48:07 -07:00
7719d54f4e
viewer#1308 LLFloaterView::restoreAll Crash
2024-04-26 01:58:50 +03:00
f886a438ed
Adapt llimageworker_test for updated virtual method API.
...
This was a broken test that got all the way to viewer release and the main
branch.
(cherry picked from commit a33a9d29380e6c1a0a9cc539be309d47adef4acf)
2024-04-25 14:38:00 -04:00
a3602d660c
Merge pull request #1323 from secondlife/main
...
Update from main
2024-04-24 16:02:42 -04:00
bc29431ab2
viewer#1309 Handle deprecated avatar properties messages
...
since server still sends those in some cases
2024-04-24 22:53:29 +03:00
5f4d312c8d
Fix BOOL vs bool issues after merge
2024-04-24 20:55:37 +03:00
4c54488470
Merge pull request #1316 from secondlife/marchcat/a-merge
...
Release (Maint YZ) -> Maint A merge
2024-04-24 20:22:45 +03:00
86c0c1d553
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-24 09:55:34 -07:00
1bcc4e7f70
Merge pull request #1313 from secondlife/marchcat/x-merge
...
Release (Maint YZ) -> Maint X merge
2024-04-24 19:48:25 +03:00
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
cadc1a02cc
1285 GLTF Animation Prototype
2024-04-24 09:51:15 -05:00
nat-goodspeed