phoenix-firestorm/indra/llrender
Ansariel 62b11fc825 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/llappviewer.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolfocus.h
#	indra/newview/llviewerhelp.h
#	indra/newview/llvoicevivox.h
2023-02-04 13:39:11 +01:00
..
CMakeLists.txt Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-01-23 16:49:24 +01:00
llatmosphere.cpp
llatmosphere.h
llcubemap.cpp
llcubemap.h
llfontbitmapcache.cpp SL-19089 Changing UI scale crashes viewer 2023-02-03 20:50:43 +02:00
llfontbitmapcache.h Merge branch contribution/emoji into DRTVWR-489-emoji 2022-11-09 23:25:02 +01:00
llfontfreetype.cpp Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-02-04 13:39:11 +01:00
llfontfreetype.h Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-01-23 16:49:24 +01:00
llfontfreetypesvg.cpp Add support for OT-SVG fonts 2022-11-06 16:25:35 +01:00
llfontfreetypesvg.h Add support for OT-SVG fonts 2022-11-06 16:25:35 +01:00
llfontgl.cpp Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-01-23 16:49:24 +01:00
llfontgl.h Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-01-23 16:49:24 +01:00
llfontregistry.cpp Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-02-04 13:39:11 +01:00
llfontregistry.h Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-01-23 16:49:24 +01:00
llgl.cpp
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
llimagegl.h
llpostprocess.cpp
llpostprocess.h
llrender.cpp Fix line widths: line widths > 1.0 are deprecated in current core profile, but not invalid; checking valid range should be sufficient if line widths > 1.0 will ever get removed in a future OGL version 2022-11-17 21:59:22 +01:00
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
lluiimage.cpp
lluiimage.h
lluiimage.inl
llvertexbuffer.cpp
llvertexbuffer.h