Ansariel 1dc82e5ed6 Merge branch 'develop' of https://github.com/secondlife/viewer ...

# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/newview/llagentcamera.cpp
#	indra/newview/llfloaterpay.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/panel_region_general.xml

2026-01-06 14:32:11 +01:00

..

CMakeLists.txt

Merge branch 'develop' of https://github.com/secondlife/viewer

2025-12-01 15:46:40 +01:00

llcubemap.cpp

#4882 Log textures that failed to be created

2025-10-28 21:23:01 +02: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

More set but unused fun

2025-09-09 09:26:37 +01:00

llcubemaparray.h

Readd probe count setting (#3793)

2025-03-24 17:59:13 -04:00

llfontbitmapcache.cpp

#3332 Remake glyph count into cache generation

2025-02-24 19:31:16 +02:00

llfontbitmapcache.h

#3332 Remake glyph count into cache generation

2025-02-24 19:31:16 +02:00

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

Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now

2024-07-08 20:27:14 +02:00

llfontfreetypesvg.h

Fix line endlings

2024-05-22 22:40:26 +03:00

llfontgl.cpp

Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer

2025-02-26 10:04:47 +01:00

llfontgl.h

Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer

2025-02-26 10:04:47 +01:00

llfontregistry.cpp

Merge branch 'develop' of https://github.com/secondlife/viewer

2024-07-09 02:25:42 +02:00

llfontregistry.h

Merge remote-tracking branch 'LL/marchcat/x-ws-merge'

2024-05-01 12:30:57 +02:00

llfontvertexbuffer.cpp

#3332 Remake glyph count into cache generation

2025-02-24 19:31:16 +02:00

llfontvertexbuffer.h

#3332 Remake glyph count into cache generation

2025-02-24 19:31:16 +02:00

llgl.cpp

Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer

2025-09-05 14:55:37 +02:00

llgl.h

Merge branch 'develop' of https://github.com/secondlife/viewer

2025-12-01 15:21:18 +01: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 branch 'develop' of https://github.com/secondlife/viewer

2024-09-13 18:54:12 +02:00

llglslshader.cpp

Disable shader profiles on RDNA3.5 to prevent freezes on startup. (#4992)

2025-11-12 12:14:19 -08:00

llglslshader.h

Disable shader profiles on RDNA3.5 to prevent freezes on startup. (#4992)

2025-11-12 12:14:19 -08: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

FIRE-36016 - Re-added Store/Restore boost levels of selected objects

2025-10-13 21:04:25 -03:00

llgltexture.h

FIRE-36016 - Re-added Store/Restore boost levels of selected objects

2025-10-13 21:04:25 -03: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 'master' of https://github.com/FirestormViewer/phoenix-firestorm

2025-10-11 14:41:58 +02:00

llimagegl.h

Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer

2024-10-22 23:39:09 +02:00

llpostprocess.cpp

Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now

2024-07-08 20:27:14 +02: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

llrender2dutils.cpp

Revert "tentative workaround for gcc c++20 std::lerp clash"

2025-03-08 23:46:30 +01:00

llrender2dutils.h

Convert LLUI and LLRender2D to LLSimpleton to reduce overhead during ui draw (#2202)

2024-08-06 16:21:19 +03:00

llrender.cpp

Merge branch 'develop' of https://github.com/secondlife/viewer

2026-01-06 14:32:11 +01:00

llrender.h

Merge branch 'develop' of https://github.com/secondlife/viewer

2026-01-06 14:32:11 +01: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

Profile guided optimization pass (#2582)

2024-09-16 18:49:03 -05:00

llrendersphere.h

Profile guided optimization pass (#2582)

2024-09-16 18:49:03 -05:00

llrendertarget.cpp

Merge branch 'develop' of https://github.com/secondlife/viewer

2025-08-12 22:50:51 +02:00

llrendertarget.h

#1931 Terminate AppViewer immediately in case of initialization failed

2024-07-08 12:16:32 +02:00

llshadermgr.cpp

Revert #4899 "Add more functionality to LLFile and cleanup LLAPRFile"

2025-12-11 01:42:52 +02:00

llshadermgr.h

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

2025-10-18 12:33:24 +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

Migrate ~LLPointer()'s peculiar warning case to llpointer.cpp.

2026-01-05 19:34:44 +02:00

lltexturemanagerbridge.h

Fix line endlings

2024-05-22 22:40:26 +03:00

lluiimage.cpp

Convert LLUI and LLRender2D to LLSimpleton to reduce overhead during ui draw (#2202)

2024-08-06 16:21:19 +03:00

lluiimage.h

#5078 Replace boost::function with std::function

2025-12-01 12:46:57 +02:00

lluiimage.inl

Fix line endlings

2024-05-22 22:40:26 +03:00

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 'develop' of https://github.com/secondlife/viewer

2025-12-01 10:22:56 +01:00