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

# Conflicts:
#	indra/cmake/Python.cmake
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp
#	indra/llui/llfloaterreg.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorylistitem.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerwindow.cpp

2026-01-23 10:46:14 +01:00

..

tests

#3969 Make inventory creation from cache faster

2025-07-28 11:48:53 +03:00

CMakeLists.txt

…

llcategory.cpp

…

llcategory.h

…

lleconomy.cpp

Merge remote-tracking branch 'LGPL/master'

2024-05-16 14:10:55 +02:00

lleconomy.h

Merge remote-tracking branch 'LGPL/master'

2024-05-16 14:10:55 +02:00

llfoldertype.cpp

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

2025-05-23 12:44:50 +02:00

llfoldertype.h

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

2025-05-23 12:44:50 +02:00

llinventory.cpp

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

2026-01-23 10:46:14 +01:00

llinventory.h

#3969 Make inventory creation from cache faster

2025-07-28 11:48:53 +03:00

llinventorydefines.cpp

…

llinventorydefines.h

…

llinventorysettings.cpp

…

llinventorysettings.h

…

llinventorytype.cpp

Enable /permissive- on MSVC for better standards conformance (#2251)

2024-08-14 08:01:02 -07:00

llinventorytype.h

Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev

2024-05-23 11:35:23 -07:00

llinvtranslationbrdg.h

…

lllandmark.cpp

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

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

lllandmark.h

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

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

llnotecard.cpp

Fix line endlings

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

llnotecard.h

…

llparcel.cpp

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

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

llparcel.h

More constexpr improvements and cleanup of includes of a deleted header file

2025-04-18 23:23:10 +03:00

llparcelflags.h

…

llpermissions.cpp

[FIRE-36028] Fix OpenSim object permissions

2025-10-21 05:11:28 +10:00

llpermissions.h

[FIRE-36028] Fix OpenSim object permissions

2025-10-21 05:11:28 +10:00

llpermissionsflags.h

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

2024-08-23 13:47:48 +02:00

llsaleinfo.cpp

#3905 Crashes in LLInventoryModel::saveToFile

2025-05-05 18:28:08 +03:00

llsaleinfo.h

#3905 Crashes in LLInventoryModel::saveToFile

2025-05-05 18:28:08 +03:00

llsettingsbase.cpp

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

2025-12-01 15:21:18 +01:00

llsettingsbase.h

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

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

llsettingsdaycycle.cpp

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

2024-10-01 13:11:13 +02:00

llsettingsdaycycle.h

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

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

llsettingssky.cpp

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

2025-06-16 12:55:12 +02:00

llsettingssky.h

#3511 fix for PBR skies being too bright on Low Graphics

2025-02-18 11:33:32 +02:00

llsettingswater.cpp

viewer#2889 Fix water's normal map being ignored

2024-10-31 22:58:14 +02:00

llsettingswater.h

viewer#2529 Optimize LLSettingsWater::blend

2024-09-12 18:45:06 +03:00

lltransactionflags.cpp

Fix line endlings

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

lltransactionflags.h

Fix line endlings

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

lltransactiontypes.h

…

lluserrelations.cpp

…

lluserrelations.h

…