Ansariel b1f05340f8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/pipeline.cpp		2025-10-11 14:41:58 +02:00
..
CMakeLists.txt	…
llatmosphere.cpp	…
llatmosphere.h	…
llcubemap.cpp	…
llcubemap.h	…
llcubemaparray.cpp	More set but unused fun	2025-09-09 09:26:37 +01:00
llcubemaparray.h	…
llfontbitmapcache.cpp	…
llfontbitmapcache.h	…
llfontfreetype.cpp	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llfontfreetype.h	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llfontfreetypesvg.cpp	…
llfontfreetypesvg.h	…
llfontgl.cpp	…
llfontgl.h	…
llfontregistry.cpp	…
llfontregistry.h	…
llfontvertexbuffer.cpp	…
llfontvertexbuffer.h	…
llgl.cpp	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llgl.h	…
llglcommonfunc.cpp	…
llglcommonfunc.h	…
llglheaders.h	…
llglslshader.cpp	Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac	2025-08-20 18:04:55 -04:00
llglslshader.h	…
llglstates.h	…
llgltexture.cpp	Reverting changes to texture pipeline back to stock LL	2025-08-17 17:26:08 +02:00
llgltexture.h	Reverting changes to texture pipeline back to stock LL	2025-08-17 17:26:08 +02:00
llgltypes.h	…
llimagegl.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-10-11 14:41:58 +02:00
llimagegl.h	…
llpostprocess.cpp	…
llpostprocess.h	…
llrender.cpp	Merge branch 'release/2025.07' of https://github.com/secondlife/viewer	2025-09-30 17:27:38 +02:00
llrender.h	Merge branch 'release/2025.07' of https://github.com/secondlife/viewer	2025-09-30 17:27:38 +02:00
llrender2dutils.cpp	…
llrender2dutils.h	…
llrendernavprim.cpp	…
llrendernavprim.h	…
llrendersphere.cpp	…
llrendersphere.h	…
llrendertarget.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-08-12 22:50:51 +02:00
llrendertarget.h	…
llshadermgr.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-09-27 11:39:25 +02:00
llshadermgr.h	Revert "Make snapshot guides more visible"	2025-10-10 08:59:40 +02:00
lltexture.cpp	…
lltexture.h	…
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
lluiimage.cpp	…
lluiimage.h	…
lluiimage.inl	…
llvertexbuffer.cpp	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llvertexbuffer.h	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00