phoenix-firestorm/indra/llinventory
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 SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
CMakeLists.txt This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
llcategory.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 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 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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 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-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
llsettingsbase.h SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingsdaycycle.cpp DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
llsettingsdaycycle.h Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
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 SL-10181, SL-10546 2019-02-13 13:09:14 -08:00
lltransactionflags.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltransactionflags.h
lltransactiontypes.h
lluserrelations.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lluserrelations.h