livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llinventory
History
Ansariel c29a661b22 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llglslshader.cpp
#	indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
#	indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
#	indra/newview/gltf/accessor.cpp
#	indra/newview/gltf/accessor.h
#	indra/newview/gltf/animation.h
#	indra/newview/gltf/asset.cpp
#	indra/newview/gltf/primitive.cpp
#	indra/newview/gltf/primitive.h
#	indra/newview/gltfscenemanager.h
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llimprocessing.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 		2024-06-13 01:54:18 +02:00
..
tests Fix line endlings 2024-05-22 22:40:26 +03:00
CMakeLists.txt Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 2022-09-17 23:12:34 +02:00
llcategory.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcategory.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lleconomy.cpp Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02:00
lleconomy.h Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02:00
llfoldertype.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llfoldertype.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llinventory.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llinventory.h Fix line endlings 2024-05-22 22:40:26 +03:00
llinventorydefines.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llinventorydefines.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llinventorysettings.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llinventorysettings.h SL-12298 Convert LLSettingsType to an LLSINGLETON variant 2020-04-28 17:47:53 +03:00
llinventorytype.cpp Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev 2024-05-23 11:35:23 -07:00
llinventorytype.h Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev 2024-05-23 11:35:23 -07:00
llinvtranslationbrdg.h Settings type inventory objects and upload the assests. 2018-03-06 14:58:39 -08:00
lllandmark.cpp Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
lllandmark.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llnotecard.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llnotecard.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llparcel.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llparcel.h Fix line endlings 2024-05-22 22:40:26 +03:00
llparcelflags.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llpermissions.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llpermissions.h Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-06-11 14:38:20 +02:00
llpermissionsflags.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llsaleinfo.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llsaleinfo.h Fix line endlings 2024-05-22 22:40:26 +03:00
llsettingsbase.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsettingsbase.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsettingsdaycycle.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llsettingsdaycycle.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llsettingssky.cpp Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
llsettingssky.h Clean up line endings that got mangled up during last merge 2024-06-11 15:40:09 +02:00
llsettingswater.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsettingswater.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lltransactionflags.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
lltransactionflags.h Fix line endlings 2024-05-22 22:40:26 +03:00
lltransactiontypes.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lluserrelations.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lluserrelations.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00