phoenix-firestorm/indra/llinventory
Ansariel 2bc4fb2bf0 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llview.h
#	indra/newview/llaisapi.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterproperties.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelmarketplaceinbox.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/llsidepanelinventory.h
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
#	indra/newview/skins/default/xui/en/sidepanel_task_info.xml
#	indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
..
tests SL-18924 - basic get/set functions for thumbnail UUID, removed obsolete binary pack/unpack functions for inventory 2023-01-09 21:14:16 +00: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
llcategory.h
lleconomy.cpp SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
lleconomy.h SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
llfoldertype.cpp Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
llfoldertype.h Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
llinventory.cpp Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 2023-02-13 23:35:21 +01:00
llinventory.h SL-19117 Textures should return asset id when thumbnail is not set 2023-02-01 16:38:47 +02: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 Firestorm LGPL 2018-09-27 22:35:07 +02:00
llinventorytype.h Merge Firestorm LGPL 2019-08-27 19:04:14 +02: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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 16:04:49 +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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01: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-567' of https://github.com/secondlife/viewer 2023-02-13 23:35:21 +01:00
llsettingssky.h SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated 2021-10-27 10:05:13 -07:00
llsettingswater.cpp DRTVWR-575: Replace some LLSDArray() usage with llsd::array(). 2023-01-03 18:06:45 -05:00
llsettingswater.h SL-10181, SL-10546 2019-02-13 13:09:14 -08:00
lltransactionflags.cpp
lltransactionflags.h
lltransactiontypes.h
lluserrelations.cpp
lluserrelations.h