Andrey Lihatskiy
|
d1c0a5b840
|
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
2023-11-29 10:45:43 +02:00 |
|
Andrey Kleshchev
|
0d8893822d
|
SL-20523 Local textures not updating on PBR Materials #5
|
2023-11-06 18:29:42 +02:00 |
|
Andrey Kleshchev
|
52c60ab3fd
|
SL-20523 Local textures not updating on PBR Materials #4
|
2023-11-06 18:29:42 +02:00 |
|
cosmic-linden
|
911dcb40fd
|
Merge pull request #486 from secondlife/SL-20397
SL-20397: Fix material set from script not updating when the GLTF material has non-default texture transforms
|
2023-11-01 12:42:17 -07:00 |
|
Cosmic Linden
|
326e7a2b4e
|
SL-20397: Fix material set from script not updating when the GLTF material has non-default texture transforms
|
2023-10-31 15:19:45 -07:00 |
|
Andrey Kleshchev
|
40e568a318
|
SL-20549 Blank no-copy materials are not moved into scripted objects
|
2023-10-31 23:18:11 +02:00 |
|
Andrey Kleshchev
|
35c3b39167
|
SL-20341 Close Item Properties on deletion
|
2023-10-03 21:14:34 +03:00 |
|
Andrey Kleshchev
|
7d50a51434
|
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-10-03 19:00:33 +03:00 |
|
Andrey Kleshchev
|
f352fd1090
|
SL-20341 Item Properties floater closes on changes for task inventory item
|
2023-09-26 20:41:03 +03:00 |
|
Cosmic Linden
|
76c8cca936
|
SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed
|
2023-08-11 16:31:01 -07:00 |
|
cosmic-linden
|
effb14913b
|
Merge pull request #260 from secondlife/SL-17405
SL-17405 (Part 2): Fix viewer not requesting land impact when a non-root prim in a link set gets a GLTF material ID update
|
2023-06-28 14:23:38 -07:00 |
|
Cosmic Linden
|
f7134beb40
|
SL-17405 (Part 2): Fix viewer not requesting land impact when a non-root prim in a link set gets a GLTF material ID update
|
2023-06-28 12:57:33 -07:00 |
|
RunitaiLinden
|
21b67896e9
|
SL-19909 Fix for reflection probes on vehicles blocking mouse clicks. Incidental instrumentation and decruft.
|
2023-06-26 15:37:18 -05:00 |
|
RunitaiLinden
|
6f5f16e031
|
SL-19655 Remove concept of "low priority" updates (RenderDebugGLSession assertion stomping pass). Remove a couple unused debug settings and related code.
|
2023-05-17 13:40:33 -05:00 |
|
RunitaiLinden
|
1cadfd44fe
|
DRTVWR-559 WIP - optimize ARC calculation et al.
|
2023-05-03 17:30:02 -05:00 |
|
RunitaiLinden
|
e09475713b
|
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
|
2023-05-02 18:47:21 -05:00 |
|
RunitaiLinden
|
5d862c994c
|
DRTVWR-559 Optimization pass on probe allocation and search. Incidental decruft.
|
2023-04-25 14:48:16 -05:00 |
|
RunitaiLinden
|
d32bca67f1
|
DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to LLFetchedGLTFMaterial
|
2023-04-14 07:36:13 -05:00 |
|
RunitaiLinden
|
7c831d115b
|
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147)
|
2023-04-03 15:22:40 -07:00 |
|
Brad Linden
|
cf3a0c77f1
|
Fix for SL-18458 overrides not applying when cache load happened before LLViewerObject::updateTEMaterialTextures call
|
2023-03-23 16:54:13 -07:00 |
|
Dave Parks
|
81bccc05e2
|
SL-18458 Fix for overrides not applying if material is not loaded on rebuild.
|
2023-03-23 13:33:21 -05:00 |
|
Andrey Kleshchev
|
d423263d54
|
SL-19169 Local material updates aren't applied with non-default transforms
|
2023-03-23 06:15:09 +02:00 |
|
Brad Linden
|
6e6bac6b40
|
Phase 2 of fix for SL-18458 material overrides not being cached properly
|
2023-03-21 13:43:40 -07:00 |
|
Dave Parks
|
25ede86382
|
SL-19172 Texture streaming tune up. Incidental decruft.
|
2023-03-10 10:52:35 -06:00 |
|
cosmic-linden
|
0dd4efea93
|
Merge pull request #85 from secondlife/SL-19002
SL-19002: Handle edge case in client networking which could cause material ID and overrides to become out-of-sync
|
2023-02-14 14:45:53 -08:00 |
|
Cosmic Linden
|
917932549f
|
SL-19002: Stop sending material IDs from client via material params and just call queueApply/queueModify
|
2023-02-14 13:59:00 -08:00 |
|
cosmic-linden
|
ba7a333969
|
Merge pull request #73 from secondlife/SL-19080
SL-19080: GLTF Material asset consistency: Part 2: Update viewer GLTF Material asset upload to v1.1
|
2023-02-14 11:40:32 -08:00 |
|
Cosmic Linden
|
d6841c0798
|
SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF compliance and removal of unsupported features
|
2023-02-09 15:05:19 -08:00 |
|
Andrey Kleshchev
|
1cc41cb9c4
|
SL-19134 Remove llfloaterproperties
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
|
2023-02-08 14:27:52 +02:00 |
|
Dave Parks
|
1c2410b8af
|
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
|
2023-02-03 19:45:31 -06:00 |
|
Dave Parks
|
830cb6b665
|
SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space.
|
2023-02-03 17:18:39 -06:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Cosmic Linden
|
2aaa15fef1
|
SL-19012: Fix new material IDs sometimes not applying when set via LSL
|
2023-01-25 12:34:35 -08:00 |
|
RunitaiLinden
|
7bd9d21e19
|
Optimizations, decruft, and intel compatibility pass (#53)
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
|
2023-01-19 09:13:45 -06:00 |
|
Cosmic Linden
|
693925ef23
|
SL-18820: Fix applying material clearing transform overrides. Loosen some asserts to allow non-default transform overrides.
|
2023-01-10 17:09:30 -08:00 |
|
Brad Linden
|
eb526fec0a
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2022-12-12 17:59:34 -08:00 |
|
Dave Parks
|
1915b7a008
|
SL-18811 Fix for reflection probes associated with an object not immediately being removed when the object is killed.
|
2022-12-12 13:36:36 -06:00 |
|
Andrey Lihatskiy
|
f836194516
|
Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
|
2022-12-12 20:53:11 +02:00 |
|
Dave Parks
|
e46323b0b9
|
SL-18682 WIP -- Clear BOOST_SELECTED as needed. GL 3.2 compatibility pass. Fix for stack underflow when reflection probes disabled.
|
2022-11-29 10:50:25 -06:00 |
|
Andrey Kleshchev
|
424593c05e
|
SL-18602 Update server params on drag n drop
|
2022-11-10 22:18:56 +02:00 |
|
Dave Parks
|
76de36c405
|
SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places that used to post to ModifyMaterialParams directly.
|
2022-11-10 13:21:06 -06:00 |
|
Dave Parks
|
1ed8f7cd0c
|
SL-18602 Fix for applying material asset not removing overrides on drag-and-drop
|
2022-11-09 17:10:31 -06:00 |
|
Andrey Kleshchev
|
c1180f1cc7
|
SL-18583 Fix race condition when setting multiple faces
And fix cases of updates not applying
|
2022-11-07 18:07:09 +02:00 |
|
Dave Parks
|
9f21fba6d9
|
SL-18513 Put profile markers around GLTF code.
|
2022-11-01 08:31:01 -05:00 |
|
Andrey Kleshchev
|
094a8876d6
|
SL-18446 Material override arrival filtering
|
2022-10-31 20:12:53 +02:00 |
|
Dave Parks
|
105f50478c
|
SL-18498 WIP -- Better handling of updates from server (don't null out overrides on updates from server unless material ID has changed)
|
2022-10-28 18:49:51 -05:00 |
|
Dave Parks
|
3b08abf70b
|
SL-18493 Fix for viewer not sending material ID updates to simulator.
|
2022-10-28 17:07:32 -05:00 |
|
Dave Parks
|
e72d0161bb
|
SL-18493 Fix for assert when setting override before material has arrived
|
2022-10-28 11:50:32 -05:00 |
|
Dave Parks
|
0451d51f4d
|
SL-18459 WIP -- fix for assert in setGLTFMaterial
|
2022-10-27 11:27:21 -05:00 |
|
Dave Parks
|
0e02f25604
|
SL-18472 Fix for assert when increasing number of texture entries on existing primitive with overrides applied.
|
2022-10-26 23:51:13 -05:00 |