livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llcharacter
History
Ansariel 9ee1a75474 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/lluuid.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/skins/default/xui/en/floater_settings_debug.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
 		2022-11-01 17:17:56 +01:00
..
tests Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02: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
llanimationstates.cpp Run Prio 0 default bento pose in the background to fix splayed hands, open mouths, etc. 2021-02-27 23:51:39 +01:00
llanimationstates.h Run Prio 0 default bento pose in the background to fix splayed hands, open mouths, etc. 2021-02-27 23:51:39 +01:00
llbvhconsts.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llbvhloader.cpp Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-02-02 12:56:43 +01:00
llbvhloader.h Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
llcharacter.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llcharacter.h SL-10471 - collision volume api 2019-02-06 13:44:54 +00:00
lleditingmotion.cpp 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
lleditingmotion.h SL-16131 Fix for alignment warnings on Win32 builds. 2021-10-14 17:41:38 +00:00
llgesture.cpp SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
llgesture.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llhandmotion.cpp 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
llhandmotion.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llheadrotmotion.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llheadrotmotion.h SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code. 2016-07-11 18:00:59 -04:00
lljoint.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
lljoint.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
lljointsolverrp3.cpp SL-16606: Don't spam logging with debug joint info. 2022-01-14 11:50:22 -08:00
lljointsolverrp3.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lljointstate.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llkeyframefallmotion.cpp SL-16606: Add profiler category AVATAR 2022-01-14 11:50:19 -08:00
llkeyframefallmotion.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llkeyframemotion.cpp Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-01 17:17:56 +01:00
llkeyframemotion.h SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator. 2022-05-18 23:30:02 +03:00
llkeyframemotionparam.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llkeyframemotionparam.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llkeyframestandmotion.cpp Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
llkeyframestandmotion.h SL-16131 Fix for alignment warnings on Win32 builds. 2021-10-14 17:41:38 +00:00
llkeyframewalkmotion.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llkeyframewalkmotion.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llmotion.cpp Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
llmotion.h Grab advanced animation preview from LL's DRTVWR-527 branch 2021-04-12 13:03:50 +02:00
llmotioncontroller.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llmotioncontroller.h Merge axon 2018-01-04 15:53:22 +01:00
llmultigesture.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llmultigesture.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llpose.cpp Backed out changeset: d3ffc46e9e92 2016-09-05 15:43:31 +03:00
llpose.h SL-16131 Fix for alignment warnings on Win32 builds. 2021-10-14 17:41:38 +00:00
llstatemachine.cpp Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
llstatemachine.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltargetingmotion.cpp 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
lltargetingmotion.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llvisualparam.cpp Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
llvisualparam.h Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00