Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559 ... # Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h		2022-09-16 21:07:39 +03:00
..
tests	…
CMakeLists.txt	…
llcategory.cpp	…
llcategory.h	…
llfoldertype.cpp	SL-18161 Properly list pbr material folder	2022-09-15 21:38:38 +03:00
llfoldertype.h	Add a (broken) material upload handler fxn	2022-04-28 11:53:43 -06:00
llinventory.cpp	SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton	2021-10-28 18:06:21 +00:00
llinventory.h	SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton	2021-10-28 18:06:21 +00:00
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	Merge branch 'master' into DRTVWR-544-maint	2022-06-29 20:31:17 +03:00
llparcel.h	SL-16297 Support the parcel obscure_moap flag.	2021-12-17 18:13:20 +02:00
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	DRTVWR-546 merge in master v6.5.1	2021-11-16 11:44:55 -07:00
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	DRTVWR-546 merge in master v6.5.1	2021-11-16 11:44:55 -07:00
llsettingswater.h	…
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…