phoenix-firestorm/indra/llprimitive
Ansariel a17fd2352a Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcharacter/llmotioncontroller.cpp
#	indra/llcrashlogger/llcrashlogger.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llmessage/llregionflags.h
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/llurlentry.cpp
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
..
tests Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
CMakeLists.txt Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-10-11 12:58:24 +02:00
legacy_object_types.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
lldaeloader.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
lldaeloader.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llgltfloader.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llgltfloader.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
llgltfmaterial.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llgltfmaterial.h Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A 2024-05-22 19:04:52 +02:00
llgltfmaterial_templates.h Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
lllslconstants.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
llmaterial.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterial.h Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02:00
llmaterialid.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
llmaterialid.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
llmaterialtable.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterialtable.h Fix line endlings 2024-05-22 22:40:26 +03:00
llmediaentry.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llmediaentry.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
llmodel.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llmodel.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llmodelloader.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmodelloader.h Fix line endlings 2024-05-22 22:40:26 +03:00
llprimitive.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llprimitive.h Fix line endlings 2024-05-22 22:40:26 +03:00
llprimlinkinfo.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
llprimtexturelist.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llprimtexturelist.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
lltextureanim.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureanim.h Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureentry.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
lltextureentry.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
lltree_common.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
lltreeparams.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
lltreeparams.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
llvolumemessage.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llvolumemessage.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
material_codes.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
material_codes.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
object_flags.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