phoenix-firestorm/indra/llrender
Andrey Kleshchev 3d73a10da3 Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
..
CMakeLists.txt Merge branch 'main' into DRTVWR-567 2023-03-30 14:09:50 +03:00
llatmosphere.cpp
llatmosphere.h
llcubemap.cpp
llcubemap.h
llfontbitmapcache.cpp
llfontbitmapcache.h
llfontfreetype.cpp
llfontfreetype.h
llfontgl.cpp Merge branch 'main' (DRTVWR-580) into DRTVWR-567 2023-07-17 23:34:59 +03:00
llfontgl.h Merge branch 'main' (DRTVWR-580) into DRTVWR-567 2023-07-17 23:34:59 +03:00
llfontregistry.cpp
llfontregistry.h
llgl.cpp SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3. 2023-04-03 13:53:18 -04:00
llgl.h
llglcommonfunc.cpp
llglcommonfunc.h
llgldbg.cpp
llgldbg.h
llglheaders.h
llglslshader.cpp
llglslshader.h
llglstates.h
llgltexture.cpp
llgltexture.h
llgltypes.h
llimagegl.cpp SL-19266 Potential Use-After-Free in LLImageGL::setImage 2023-03-21 17:04:48 +01:00
llimagegl.h
llpostprocess.cpp
llpostprocess.h
llrender.cpp
llrender.h
llrender2dutils.cpp
llrender2dutils.h
llrendernavprim.cpp
llrendernavprim.h
llrendersphere.cpp
llrendersphere.h
llrendertarget.cpp
llrendertarget.h
llshadermgr.cpp
llshadermgr.h
lltexture.cpp
lltexture.h
lltexturemanagerbridge.cpp SL-19134 Some texture related adjustments 2023-02-07 12:36:20 +02:00
lltexturemanagerbridge.h SL-19134 Some texture related adjustments 2023-02-07 12:36:20 +02:00
lluiimage.cpp
lluiimage.h
lluiimage.inl
llvertexbuffer.cpp
llvertexbuffer.h