livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,821 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

120 Commits (3079cda4868fb736d20cd07698a164b109704d47)

Author SHA1 Message Date
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
Rye Mutt 129301c8e9 Fix multiple leaks in the case of failure to deserialize animations 2022-10-28 15:46:42 -04:00
Ansariel 7cc7b74778 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-05-26 11:48:40 +02:00
Ansariel 5cdd8cdb6e Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:43:21 +02:00
Andrey Lihatskiy 91606c7b60 Merge branch 'master' into DRTVWR-548-maint-N 2022-05-26 03:07:05 +03:00
Mnikolenko Productengine ef7254a68a SL-17206 Unable to move an avatar after a strong fall on the ground 2022-05-25 16:15:14 +03:00
Ansariel b96f92f884 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-05-19 20:31:00 +02:00
Brad Payne (Vir Linden) 307db06310 SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator. 
# Conflicts:
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvoavatar.cpp
#	scripts/content_tools/anim_tool.py
 2022-05-18 23:30:02 +03:00
Brad Payne (Vir Linden) f7edcab9c3 SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names 
# Conflicts:
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvoavatar.cpp
 2022-05-18 23:25:51 +03:00
Ansariel 711799a7d5 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-05-05 11:28:38 +02:00
Mnikolenko Productengine ddaa0d84cc SL-17206 FIXED Unable to move an avatar after fall on the ground 2022-04-29 19:06:22 +03:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy 84b746ad8e SL-16606: Add profiler category AVATAR 2022-01-14 11:50:22 -08:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f 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
Callum Prentice 168d177197 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
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 2e6f516411 Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more 2020-09-16 21:12:53 -07:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. 2020-09-16 18:53:24 -07:00
Ansariel 61c56570ab Merge viewer-eep 2019-08-13 19:05:23 +02:00
Graham Linden 76128c4357 SL-10566 Use vector for some high-traffic, low-item count containers instead of list. 
Provide method of storing joint indices sep from weight data for faster runtime processing.
 2019-08-05 12:04:29 -07:00
Beq 1f5d3f9871 Add memleak avoidance for the new exit paths 2019-02-06 23:09:40 +00:00
Brad Payne (Vir Linden) 84cca265e5 SL-10471 - animation validation for constraints 2019-02-05 21:38:00 +00:00
Brad Payne (Vir Linden) a77344516c SL-10471 - animation validation for constraints 2019-02-05 21:38:00 +00:00
Ansariel cb20bc0425 Merge viewer-neko 2018-08-01 01:20:01 +02:00
andreykproductengine e24d4c9f4d MAINT-8923 Better allocation failure handling, createGLTexture crashes 2018-07-26 20:06:26 +03:00
Ansariel ec3767aece Merge viewer-vivox 2017-06-19 21:48:29 +02:00
Brad Payne (Vir Linden) e647ea2ef4 MAINT-7466 - added more verbose logging of animation issues found by the viewer, including invalid joints. Flag the asset id now. 2017-06-06 19:09:08 +01:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
Ansariel 92f6d8d521 Merge viewer-bear 2016-10-01 17:03:57 +02:00
andreykproductengine 5b61515ca3 MAINT-6694 Gesture floater crash 2016-09-22 12:34:52 +03:00
Ansariel 88b928e1dd Merge bento-box 2016-06-16 00:53:56 +02:00
Brad Payne (Vir Linden) 93bafda56b MAINT-6366 - diagnostics related to animation asset downloads 2016-06-13 09:15:42 -04:00
Ansariel 919521d121 Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel 7bbcfe8541 Merge bento-box 2016-02-24 23:38:26 +01:00
Aura Linden a67a01b2a3 MAINT-6162 limit joint offset distances in old style .anim format 2016-02-23 10:47:21 -08:00
Ansariel dd1a86c20c Merge bento-box 2016-02-12 19:52:34 +01:00
Brad Payne (Vir Linden) f8ee9ffce6 SL-333 work - attachment joints now get a valid mJointNum, more checking on valid joint num values. Also reduced log spam slightly. 2016-02-03 16:52:27 -05:00
Ansariel be6ce75a96 Merge bento-box 2015-12-17 11:47:42 +01:00
Ansariel d48a2f407b Undo JointMotionListHolder for now... 2015-12-17 09:13:47 +01:00
Brad Payne (Vir Linden) 7b410df303 SL-124 WIP - cleanup of comments and test code before going to project viewer. 2015-11-25 15:07:26 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 4176606cd6 FIRE-14972/FIRE-14589: Fix for memory corruption. 2015-09-10 00:59:20 +02:00
Ansariel 9ab07f8836 Mem-leak fixes and more by Drake Arconis (Alchemy Viewer) 2015-09-09 22:52:35 +02:00