phoenix-firestorm/indra/llprimitive
Andrey Kleshchev 069304ca39 Merge branch 'master' (DRTVWR-543) into DRTVWR-559
# Conflicts:
#	autobuild.xml
#	indra/llrender/llgl.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
..
tests SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages 2022-04-27 14:48:25 -07:00
CMakeLists.txt SL-17653 Last commit was accidentally partial 2022-06-23 16:40:48 -05:00
legacy_object_types.h
lldaeloader.cpp SL-17214 additional glTF validation, remove dead code from DAE loader 2022-06-08 13:33:59 -06:00
lldaeloader.h SL-17214 additional glTF validation, remove dead code from DAE loader 2022-06-08 13:33:59 -06:00
llgltfloader.cpp Correcting windows specific filesystem issues and removing unused DAE code in llgltfloader.cpp from SL-17214 2022-06-23 22:53:55 -07:00
llgltfloader.h Correcting windows specific filesystem issues and removing unused DAE code in llgltfloader.cpp from SL-17214 2022-06-23 22:53:55 -07:00
llgltfmaterial.h SL-17379 More complete integration of material asset type 2022-06-28 15:15:57 -05:00
lllslconstants.h
llmaterial.cpp Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
llmaterial.h Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
llmaterialid.cpp SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save" 2022-06-23 16:21:53 -05:00
llmaterialid.h SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save" 2022-06-23 16:21:53 -05:00
llmaterialtable.cpp SL-14960 Add checkbox to turn off collision sound. 2021-04-06 18:24:21 +03:00
llmaterialtable.h SL-14960 Add checkbox to turn off collision sound. 2021-04-06 18:24:21 +03:00
llmediaentry.cpp SL-2202 Add exception handling around boost::regex_match() calls in the viewer 2021-01-11 17:07:03 +02:00
llmediaentry.h
llmodel.cpp Merge branch 'master' into DRTVWR-543-maint 2022-05-27 02:51:33 +03:00
llmodel.h Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
llmodelloader.cpp SL-17214 initial loader class skeleton 2022-06-08 13:33:59 -06:00
llmodelloader.h SL-304 [Mesh Uploader] Localization support for logs, better warnings for joints 2019-11-27 20:34:26 +02:00
llprimitive.cpp SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes" 2022-06-09 19:43:21 -05:00
llprimitive.h SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes" 2022-06-09 19:43:21 -05:00
llprimlinkinfo.h
llprimtexturelist.cpp
llprimtexturelist.h
lltextureanim.cpp SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
lltextureanim.h
lltextureentry.cpp
lltextureentry.h SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save" 2022-06-23 16:21:53 -05:00
lltree_common.h
lltreeparams.cpp
lltreeparams.h
llvolumemessage.cpp
llvolumemessage.h
material_codes.cpp
material_codes.h
object_flags.h