livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,631 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

627 Commits (e46323b0b9fea77522ee4637a82e2e86de15bb83)

Author SHA1 Message Date
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
Dave Parks 65eec2ca8f Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-26 17:22:50 -05:00
Dave Parks 8f47657d64 SL-18443 Allow nulling out of override data and implement new override message protocol. 2022-10-26 16:08:28 -05:00
Brad Kittenbrink caed8871ab Xcode build fixes for DRTVWR-559 2022-10-25 10:50:26 -07:00
Dave Parks 5c86ec6a61 SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them. 2022-10-24 16:26:42 -05:00
Dave Parks 88659e9fe7 SL-18105 When saving an object's material to inventory, save the version that as overrides applied. 2022-10-22 15:25:03 -05:00
Dave Parks 40695bbd31 SL-18105 Fix for overrides not showing until a forced mesh update. 2022-10-20 13:55:42 -05:00
Dave Parks 8741c05cc1 SL-18105 Hook up TE override material to render pipe by way of render material. 2022-10-19 17:23:54 -05:00
Dave Parks de4c018499 SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side. 2022-10-19 14:41:17 -05:00
Andrey Kleshchev 1a437cbedf SL-18144 Bakes On Mesh not showing in-world as Albedo 2022-10-04 20:33:10 +03:00
Andrey Kleshchev e6fad1ea5f SL-17999 Material with limited permissions should be copied to object's inventory 2022-09-27 23:26:25 +03:00
Dave Parks 8f1d226865 SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec 2022-09-23 11:19:56 -05:00
Andrey Kleshchev 94b9286858 SL-17999 'copy' functionality for 'features' and 'texture' tabs 
And a fix to prevent message spam
 2022-09-22 11:06:41 +03:00
Sabrina Shanman 58c478f08a Merged in SL-18001 (pull request #1137) 
SL-18001: Update GLTF material when receiving LLRenderMaterialParams on updated object

Approved-by: Brad Kittenbrink
 2022-09-20 23:09:30 +00:00
Cosmic Linden 3e807dbc29 SL-18001: Update GLTF material when receiving LLRenderMaterialParams on updated object 2022-09-19 16:55:57 -07:00
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
 2022-09-16 21:07:39 +03:00
Andrey Kleshchev 5034c565bf SL-18044 (PBR) No-copy textures not applying to objects 2022-09-14 01:37:46 +03:00
Dave Parks d048795fce SL-17870 Nudge PBR material textures so they start downloading. (and add missing validation code for reflection probes network data). 2022-08-05 16:58:22 -05:00
Dave Parks 6f6df8ed71 SL-17685 Drag and drop material support 2022-06-29 21:42:44 -05:00
Dave Parks fd6b5ea8c3 SL-17685 Drag and drop material support WIP 2022-06-29 17:59:09 -05:00
Dave Parks 394479d7cc SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save" 2022-06-23 16:21:53 -05:00
Dave Parks bc85cc300d SL-17551 Followup -- remove some dead pick-render related code. 2022-06-09 14:26:23 -05:00
Dave Parks 0d9c23372b SL-17551 Add "Select Reflection Probes" menu option and make invisible objects less annoying when alt-zooming in edit mode. 2022-06-09 14:09:33 -05:00
Dave Parks 220afbcda0 SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume 2022-06-02 18:42:38 -05:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Dave Parks 53c692c959 SL-17416 Quick 'n dirty reflection probe override hack. 2022-05-17 14:32:07 -05:00
Brad Kittenbrink cc04903379 Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging 2022-04-28 14:05:49 -07:00
Brad Kittenbrink c9fbd9e2e8 SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages 2022-04-27 14:48:25 -07:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00
Andrey Kleshchev 625cc84ec0 SL-16865 llStopSound() does not stop sound if it is out of cutoff radius 2022-03-21 09:44:55 +02:00
Andrey Kleshchev 3e9a13dc07 SL-17008 Viewer spams 'mSourceObject is NULL' warning 2022-03-16 18:11:44 +02:00
Mnikolenko Productengine d91606b354 Merge branch 'master' into DRTVWR-544-maint 2021-12-20 15:36:23 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Kleshchev 875e502cc9 SL-13867 Developer ability to select and reposition multiple avatars 2021-11-09 19:05:24 +02:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Brad Payne (Vir Linden) a184a0fbee SL-15999 - noninteractive mode: create minimal objects,load no textures 2021-09-28 20:10:06 +01:00
Brad Payne (Vir Linden) c10d601ce8 SL-15999 - track --noninteractive state with gNonInteractive flag 2021-09-20 13:19:20 +01:00
Brad Payne (Vir Linden) 0918958507 SL-15999 - disable various types of loading in noninteractive mode 2021-09-17 16:45:56 +01:00