livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llrender
History
Ansariel 18903f6cac Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llshadermgr.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurface.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 		2024-06-11 19:04:21 +02:00
..
CMakeLists.txt Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-18 19:25:49 +01:00
llatmosphere.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
llatmosphere.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
llcubemap.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llcubemap.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
llcubemaparray.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llcubemaparray.h Fix line endlings 2024-05-22 22:40:26 +03:00
llfontbitmapcache.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
llfontbitmapcache.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
llfontfreetype.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llfontfreetype.h Fix line endlings 2024-05-22 22:40:26 +03:00
llfontfreetypesvg.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
llfontfreetypesvg.h Fix line endlings 2024-05-22 22:40:26 +03:00
llfontgl.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llfontgl.h Fix line endlings 2024-05-22 22:40:26 +03:00
llfontregistry.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llfontregistry.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llgl.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llgl.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llglcommonfunc.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
llglcommonfunc.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
llglheaders.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llglslshader.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llglslshader.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llglstates.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
llgltexture.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llgltexture.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llgltypes.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
llimagegl.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llimagegl.h Fix line endlings 2024-05-22 22:40:26 +03:00
llpostprocess.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llpostprocess.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
llrender.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llrender.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llrender2dutils.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llrender2dutils.h Fix line endlings 2024-05-22 22:40:26 +03:00
llrendernavprim.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
llrendernavprim.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
llrendersphere.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
llrendersphere.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
llrendertarget.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llrendertarget.h Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llshadermgr.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llshadermgr.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
lltexture.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
lltexture.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
lltexturemanagerbridge.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
lltexturemanagerbridge.h Fix line endlings 2024-05-22 22:40:26 +03:00
lluiimage.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
lluiimage.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
lluiimage.inl Fix line endlings 2024-05-22 22:40:26 +03:00
llvertexbuffer.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llvertexbuffer.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00