Ansariel 7c3b74a0df Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml		2024-12-04 16:11:44 +01:00
..
tests	…
CMakeLists.txt	…
llcategory.cpp	…
llcategory.h	…
lleconomy.cpp	…
lleconomy.h	…
llfoldertype.cpp	…
llfoldertype.h	…
llinventory.cpp	…
llinventory.h	…
llinventorydefines.cpp	…
llinventorydefines.h	…
llinventorysettings.cpp	…
llinventorysettings.h	…
llinventorytype.cpp	…
llinventorytype.h	…
llinvtranslationbrdg.h	…
lllandmark.cpp	…
lllandmark.h	…
llnotecard.cpp	…
llnotecard.h	…
llparcel.cpp	…
llparcel.h	…
llparcelflags.h	…
llpermissions.cpp	…
llpermissions.h	…
llpermissionsflags.h	…
llsaleinfo.cpp	…
llsaleinfo.h	…
llsettingsbase.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-11-07 18:00:20 +01:00
llsettingsbase.h	viewer#2529 Optimize LLSettingsWater::blend	2024-09-12 18:45:06 +03: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 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer	2024-12-04 16:11:44 +01:00
llsettingssky.h	#3170 Fix for tonemapping not working with PBR skies.	2024-11-28 17:57:30 -05: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	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…