phoenix-firestorm/indra/llprimitive
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +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-18105 Add to/from json capability to LLGLTFMaterial 2022-10-14 17:35:48 -05:00
legacy_object_types.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lldaeloader.cpp SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes. 2022-09-23 12:53:24 -05: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.cpp SL-18105 Add remaining parameters to applyOverride 2022-10-20 17:45:03 -05:00
llgltfmaterial.h SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub) 2022-10-20 11:33:25 -07: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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llmodel.cpp Merge branch 'master' (DRTVWR-548) into DRTVWR-559 2022-10-21 18:19:27 +03:00
llmodel.h Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-09-16 16:25:38 -05: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-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
llprimitive.h SL-17685 Drag and drop material support 2022-06-29 21:42:44 -05:00
llprimlinkinfo.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llprimtexturelist.cpp merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
llprimtexturelist.h merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
lltextureanim.cpp SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
lltextureanim.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltextureentry.cpp SL-18105 Hook up TE override material to render pipe by way of render material. 2022-10-19 17:23:54 -05:00
lltextureentry.h Xcode compat fix for SL-18105 material overrides 2022-10-19 15:32:18 -07:00
lltree_common.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltreeparams.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltreeparams.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llvolumemessage.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llvolumemessage.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
material_codes.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
material_codes.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
object_flags.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00