Andrey Kleshchev 069304ca39 Merge branch 'master' (DRTVWR-543) into DRTVWR-559 ... # Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp		2022-06-29 21:23:23 +03:00
..
tests	…
CMakeLists.txt	…
llcategory.cpp	…
llcategory.h	…
llfoldertype.cpp	…
llfoldertype.h	Add a (broken) material upload handler fxn	2022-04-28 11:53:43 -06:00
llinventory.cpp	…
llinventory.h	…
llinventorydefines.cpp	…
llinventorydefines.h	…
llinventorysettings.cpp	…
llinventorysettings.h	…
llinventorytype.cpp	SL-17649 Icon for Material type in Inventory	2022-06-24 13:09:24 +03:00
llinventorytype.h	Beginning viewer side work for SL-17198 new asset and inventory types for Materials	2022-04-28 13:08:37 -07:00
llinvtranslationbrdg.h	…
lllandmark.cpp	…
lllandmark.h	…
llnotecard.cpp	…
llnotecard.h	…
llparcel.cpp	Initialize PODs with 0 and not leave anyting to chance.	2022-02-28 22:20:41 +01:00
llparcel.h	…
llparcelflags.h	…
llpermissions.cpp	…
llpermissions.h	…
llpermissionsflags.h	…
llsaleinfo.cpp	…
llsaleinfo.h	…
llsettingsbase.cpp	SL-16606: Add profiler category ENVIRONMENT	2022-01-14 11:50:19 -08:00
llsettingsbase.h	…
llsettingsdaycycle.cpp	…
llsettingsdaycycle.h	…
llsettingssky.cpp	SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager	2022-06-10 16:36:38 -05:00
llsettingssky.h	SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager	2022-06-10 16:36:38 -05:00
llsettingswater.cpp	…
llsettingswater.h	…
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…