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
..
CMakeLists.txt	SL-19134 Some texture related adjustments	2023-02-07 12:36:20 +02:00
llavatarappearance.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02:00
llavatarappearance.h	Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer	2020-12-08 09:41:10 +01:00
llavatarappearancedefines.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 19:05:20 +01:00
llavatarappearancedefines.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 19:05:20 +01:00
llavatarjoint.cpp	SL-14529 Replace dynamic_cast to LLAvatarJoint with static casts	2021-01-04 16:33:50 +02:00
llavatarjoint.h	SL-333 WIP - added back some unused constructors to make the appearance utility happier	2016-02-12 15:40:46 -05:00
llavatarjointmesh.cpp	SL-10566 Use vector for some high-traffic, low-item count containers instead of list.	2019-08-05 12:04:29 -07:00
llavatarjointmesh.h	merge with viewer-release	2013-06-05 19:05:43 -07:00
lldriverparam.cpp	Merge viewer-eep	2019-08-13 19:05:23 +02:00
lldriverparam.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lljointpickname.h	…
lllocaltextureobject.cpp	Fix leak of tex layer objects during LLLocalTextureObject destruction	2022-10-19 22:16:39 -04:00
lllocaltextureobject.h	…
llpolymesh.cpp	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-08-02 12:51:33 +02:00
llpolymesh.h	Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak	2013-08-10 01:15:44 +02:00
llpolymorph.cpp	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-08-02 12:51:33 +02:00
llpolymorph.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
llpolyskeletaldistortion.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
llpolyskeletaldistortion.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lltexglobalcolor.cpp	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
lltexglobalcolor.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
lltexlayer.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-27 11:41:45 +02:00
lltexlayer.h	Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer	2022-04-19 13:21:52 +02:00
lltexlayerparams.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lltexlayerparams.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
llviewervisualparam.cpp	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-11-12 11:05:22 +01:00
llviewervisualparam.h	MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.	2014-05-23 21:56:44 +01:00
llwearable.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 22:50:13 +01:00
llwearable.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llwearabledata.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 22:50:13 +01:00
llwearabledata.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llwearabletype.cpp	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-11-12 11:05:22 +01:00
llwearabletype.h	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-12-09 13:14:39 +01:00