livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llprimitive
History
Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llstatgraph.cpp
#	indra/llui/llvirtualtrackball.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaceprofile.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llworldmapview.cpp
 		2024-07-09 02:25:42 +02:00
..
tests Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
CMakeLists.txt Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +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 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +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 compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
llgltfmaterial.h Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +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 Post-merge - trim trailing whitespace 2024-06-10 20:45:59 +03:00
llmaterialid.cpp Reduce LLSD::Binary temporaries 2024-07-05 02:56:25 -04: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 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +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 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llprimitive.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02: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 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02: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 Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02: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