summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2022-08-08SL-17937 Fix for broken PBR material batching.Dave Parks
2022-08-05Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-08-05SL-17870 Nudge PBR material textures so they start downloading. (and add ↵Dave Parks
missing validation code for reflection probes network data).
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-06-29SL-17685 Drag and drop material supportDave Parks
2022-06-29Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-29SL-17685 Drag and drop material support WIPDave Parks
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-23Correcting windows specific filesystem issues and removing unused DAE code ↵Brad Kittenbrink
in llgltfloader.cpp from SL-17214
2022-06-23SL-17653 Last commit was accidentally partialDave Parks
2022-06-23SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵Dave Parks
when you click "Save"
2022-06-11SL-17475 Remap models before simplificationAndrey Kleshchev
2022-06-09SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select ↵Dave Parks
Invisible Objects" checkbox instead of "Select Reflection Probes"
2022-06-09VS2019 build fixDave Parks
2022-06-08SL-17214 remove some dae clutter from gltf headerDave Houlton
2022-06-08SL-17214 add 3p-tinygltf dependency to autobuild.xmlDave Houlton
2022-06-08SL-17214 re-work gltf data organizationDave Houlton
2022-06-08SL-17214 additional glTF validation, remove dead code from DAE loaderDave Houlton
2022-06-08SL-17214 initial loader class skeletonDave Houlton
2022-06-03SL-17285 Build fix take two.Dave Parks
2022-06-02SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and ↵Dave Parks
LLPanelVolume
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-27SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and ↵Brad Kittenbrink
related messages
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-20SL-16289 Rigged mesh rendering overhaulDave Parks
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-11-15SL-15756 Removed mHasGeneratedFacesAndrey Kleshchev
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-10-14SL-16131 Fix for alignment warnings on Win32 builds.Dave Parks
2021-09-20SL-16006 and SL-16009 Rigged mesh rendering optimization passDave Parks
2021-09-09SL-15965 Support wider range of parsing errorsAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-08-04DRTVWR-542 Automated method selectionAndrey Kleshchev
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04DRTVWR-542 Fix incorect dropbox stateAndrey Kleshchev
2021-07-28DRTVWR-542 Fix malfunctioning warningAndrey Kleshchev
2021-06-07Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:36:57 +0000