Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp		2021-06-25 00:51:02 +03:00
..
tests	SL-13669 tests should cover import/export category from llsd	2020-08-10 20:50:27 +03:00
CMakeLists.txt	Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"	2021-03-08 13:56:16 +00:00
llcategory.cpp	…
llcategory.h	…
llfoldertype.cpp	…
llfoldertype.h	…
llinventory.cpp	SL-13669 tests should cover import/export category from llsd	2020-08-10 20:50:27 +03:00
llinventory.h	Merge branch 'master' into DRTVWR-513-maint	2020-11-11 22:14:24 +02:00
llinventorydefines.cpp	…
llinventorydefines.h	…
llinventorysettings.cpp	SL-12298 Convert LLSettingsType to an LLSINGLETON variant	2020-04-28 17:47:53 +03:00
llinventorysettings.h	SL-12298 Convert LLSettingsType to an LLSINGLETON variant	2020-04-28 17:47:53 +03:00
llinventorytype.cpp	…
llinventorytype.h	Merge 6.3.1 viewer-release	2019-08-26 12:35:18 -07:00
llinvtranslationbrdg.h	…
lllandmark.cpp	SL-13986 Validate uuid	2020-09-24 21:09:38 +03:00
lllandmark.h	SL-13986 Validate buffer size to avoid SIGBUS crash on sscanf	2020-09-23 22:44:17 +03:00
llnotecard.cpp	…
llnotecard.h	…
llparcel.cpp	…
llparcel.h	SL-14797 Normalize right-click menus on Landmarks & Picks Part#3	2021-02-09 01:59:15 +02:00
llparcelflags.h	SL-14797 Normalize right-click menus on Landmarks & Picks Part#3	2021-02-09 01:59:15 +02:00
llpermissions.cpp	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llpermissions.h	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llpermissionsflags.h	…
llsaleinfo.cpp	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llsaleinfo.h	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llsettingsbase.cpp	SL-12911 Add Debug setting EnvironmentPersistAcrossLogin	2020-03-27 00:24:08 +02:00
llsettingsbase.h	SL-12963 Additional environment debug output	2020-05-08 23:00:51 +03:00
llsettingsdaycycle.cpp	SL-13467 Make LLTrace::BlockTimerStatHandle keys unique	2020-06-29 21:30:07 +03:00
llsettingsdaycycle.h	Removed obsolete and misleading variable	2020-03-27 00:24:07 +02:00
llsettingssky.cpp	SL-12978 Add note about similar code in C++ and GLSL	2020-07-01 13:42:23 -07:00
llsettingssky.h	SL-11776	2019-08-22 11:19:04 -07:00
llsettingswater.cpp	…
llsettingswater.h	…
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…