phoenix-firestorm/indra/llappearance
Andrey Kleshchev 7d50a51434 Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
..
CMakeLists.txt Merge branch 'main' into DRTVWR-567 2023-03-30 14:09:50 +03:00
llavatarappearance.cpp SL-18619 Eyes not rendering in Shape floater thumbnails 2023-07-27 05:02:43 +02:00
llavatarappearance.h SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarappearancedefines.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarappearancedefines.h Merge remote-tracking branch 'origin/master' into DRTVWR-517 2021-02-01 20:20:33 +00:00
llavatarjoint.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +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-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarjointmesh.h merge with viewer-release 2013-06-05 19:05:43 -07:00
lldriverparam.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lldriverparam.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
lljointpickname.h
lllocaltextureobject.cpp Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
lllocaltextureobject.h Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
llpolymesh.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llpolymesh.h Summer cleaning - removed a lot of llcommon dependencies to speed up build times 2013-07-30 19:13:45 -07:00
llpolymorph.cpp SL-18893 OSX buildfix 2023-01-16 23:16:43 +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 SL-18893 OSX buildfix 2023-01-16 23:16:43 +02:00
llpolyskeletaldistortion.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
lltexglobalcolor.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lltexglobalcolor.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltexlayer.cpp Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
lltexlayer.h void LLTexLayerSet::asLLSD was never used, remove it completely. 2022-04-14 14:31:57 -04:00
lltexlayerparams.cpp Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
lltexlayerparams.h SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00
llviewervisualparam.cpp SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02: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 SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llwearable.h Faster and simpler inventory category hashing. 2023-02-06 11:30:23 +01:00
llwearabledata.cpp Faster and simpler inventory category hashing. 2023-02-06 11:30:23 +01:00
llwearabledata.h Faster and simpler inventory category hashing. 2023-02-06 11:30:23 +01:00
llwearabletype.cpp SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
llwearabletype.h SL-14303 Wearable type label should contain translated intead of default string 2020-11-13 14:58:14 +02:00