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-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
CMakeLists.txt	Merge branch 'master' into DRTVWR-543-maint	2021-12-26 14:01:17 +02:00
llimage.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-03-08 16:20:47 +01:00
llimage.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-02-16 10:54:59 +01:00
llimagebmp.cpp	SL-11138 Bitmaps format support bug	2019-05-15 19:28:17 +03:00
llimagebmp.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00
llimagedimensionsinfo.cpp	Merge viewer-bear	2018-01-25 21:55:38 +01:00
llimagedimensionsinfo.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llimagedxt.cpp	MAINT-8923 Better allocation failure handling, createGLTexture crashes	2018-07-26 20:06:26 +03:00
llimagedxt.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00
llimagefilter.cpp	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llimagefilter.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llimagej2c.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
llimagej2c.h	Buildfix: brought back LINDEN_J2C_COMMENT_PREFIX	2016-08-05 00:58:09 +03:00
llimagejpeg.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
llimagejpeg.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00
llimagepng.cpp	Merge viewer-neko	2018-08-01 01:20:01 +02:00
llimagepng.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00
llimagetga.cpp	Merge viewer-neko	2018-08-01 01:20:01 +02:00
llimagetga.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00
llimageworker.cpp	Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer	2023-02-13 23:35:21 +01:00
llimageworker.h	Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer	2023-02-13 23:35:21 +01:00
llmapimagetype.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llpngwrapper.cpp	Correct macOS png loader to use a default gamma of 2.2 as apple has done since OS 10.6	2022-10-30 18:05:34 -04:00
llpngwrapper.h	STORM-2148 Crash on trying to save texture file(s) to computer from inventory	2017-05-31 19:28:46 +03:00