phoenix-firestorm/indra/llinventory
Ansariel 9057bfc995 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llcallstack.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llmath/llvolume.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llviewerstats.cpp
#	indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02:00
..
tests SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
CMakeLists.txt Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 2022-09-17 23:12:34 +02:00
llcategory.cpp
llcategory.h
lleconomy.cpp
lleconomy.h
llfoldertype.cpp Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-16 09:37:16 +02:00
llfoldertype.h Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-05-21 15:04:54 +02:00
llinventory.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01: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 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-07 12:29:58 +02:00
llinventorysettings.h SL-12298 Convert LLSettingsType to an LLSINGLETON variant 2020-04-28 17:47:53 +03:00
llinventorytype.cpp Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-06-27 17:58:22 +02: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 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-29 11:41:06 +02: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 Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 2022-09-17 14:37:33 +02: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 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-18 23:53:40 +02:00
llpermissions.h Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-18 23:53:40 +02: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 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-05-05 12:35:33 +02:00
llsettingsdaycycle.h Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer 2020-04-01 15:00:34 +02:00
llsettingssky.cpp Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-05-05 12:35:33 +02:00
llsettingssky.h SL-18780 Turn down contribution of cloud shadow to reflection probe ambiance and make the value a debug setting. 2023-02-07 12:59:38 -06:00
llsettingswater.cpp Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-05-05 12:35:33 +02:00
llsettingswater.h
lltransactionflags.cpp
lltransactionflags.h
lltransactiontypes.h
lluserrelations.cpp
lluserrelations.h