livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llrender
History
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
 		2024-03-12 16:52:30 +01:00
..
CMakeLists.txt Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
llatmosphere.cpp
…
llatmosphere.h
…
llcubemap.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llcubemap.h
…
llcubemaparray.cpp llrender: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
llcubemaparray.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llfontbitmapcache.cpp Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontbitmapcache.h Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontfreetype.cpp Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontfreetype.h Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontfreetypesvg.cpp
…
llfontfreetypesvg.h
…
llfontgl.cpp Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontgl.h Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontregistry.cpp Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llfontregistry.h
…
llgl.cpp Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 2024-03-12 16:52:30 +01:00
llgl.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llglcommonfunc.cpp
…
llglcommonfunc.h
…
llglheaders.h
…
llglslshader.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llglslshader.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llglstates.h
…
llgltexture.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llgltexture.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llgltypes.h
…
llimagegl.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llimagegl.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llpostprocess.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llpostprocess.h
…
llrender.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llrender.h Fix DRTVWR-559 std::array usage in llrender and llprimitive after merge 2023-10-25 16:44:14 -07:00
llrender2dutils.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llrender2dutils.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llrendernavprim.cpp
…
llrendernavprim.h
…
llrendersphere.cpp
…
llrendersphere.h
…
llrendertarget.cpp
…
llrendertarget.h
…
llshadermgr.cpp Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llshadermgr.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
lltexture.cpp
…
lltexture.h
…
lltexturemanagerbridge.cpp
…
lltexturemanagerbridge.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
lluiimage.cpp
…
lluiimage.h
…
lluiimage.inl Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00
llvertexbuffer.cpp SL-19709 Fix for fullbright shiny not factoring out exposure (update) 2023-09-05 16:59:48 +02:00
llvertexbuffer.h Convert BOOL to bool in llrender 2024-02-20 02:14:01 +02:00