livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llprimitive
History
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
 		2024-04-24 19:28:15 +03:00
..
tests Merge branch 'main' into marchcat/a-merge 2024-04-24 19:28:15 +03:00
CMakeLists.txt SL-20225: LLGLTFMaterial code sync 2023-10-09 16:05:58 -07: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 Merge branch 'main' into marchcat/a-merge 2024-04-24 19:28:15 +03:00
lldaeloader.h SL-17214 additional glTF validation, remove dead code from DAE loader 2022-06-08 13:33:59 -06:00
llgltfloader.cpp SL-20781 Follow up on boost to std replacement 2024-01-09 00:19:39 +02: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 Merge branch 'main' into DRTVWR-600-maint-A 2024-01-08 23:38:28 +02:00
llgltfmaterial.h Fix LLGLTFMaterial hashing 2023-12-06 03:42:09 +02:00
llgltfmaterial_templates.h SL-20225: LLGLTFMaterial code sync 2023-10-09 16:05:58 -07:00
lllslconstants.h Pulling over more lsl changes to support the adding of the LSL_XP_XXX constants 2014-08-06 13:49:29 -07:00
llmaterial.cpp Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
llmaterial.h Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02: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 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
llmaterialtable.cpp Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
llmaterialtable.h Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02: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 'main' into marchcat/a-merge 2024-04-24 19:28:15 +03:00
llmodel.h Merge branch 'main' into marchcat/a-merge 2024-04-24 19:28:15 +03:00
llmodelloader.cpp Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
llmodelloader.h Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
llprimitive.cpp Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
llprimitive.h Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02: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 Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
lltextureanim.h Convert remaining cases of BOOL to bool in llmath and llprimitive 2024-02-20 02:14:01 +02:00
lltextureentry.cpp SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time. 2023-04-11 15:09:58 -05:00
lltextureentry.h SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147) 2023-04-03 15:22:40 -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