Ansariel
|
8b0d341aca
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-10-21 12:34:53 +02:00 |
|
Ansariel
|
47964fb28d
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
|
2022-10-20 16:47:38 +02:00 |
|
Rye Mutt
|
5326e3a206
|
Fix leak of mRoot during LLAvatarAppearance destruction
|
2022-10-19 22:17:34 -04:00 |
|
Ansariel
|
5cdd8cdb6e
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-05-26 11:43:21 +02: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)
|
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
|
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 |
|
Ansariel
|
0ba281e843
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-12-08 09:41:10 +01:00 |
|
Mnikolenko ProductEngine
|
792c086e91
|
SL-14369 Get rid of static sSkeletonXMLTree
|
2020-11-30 20:19:54 +02:00 |
|
Mnikolenko ProductEngine
|
0bd916d9ed
|
SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()
|
2020-11-30 15:57:44 +02:00 |
|
Ansariel
|
a0be0371d7
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-11-12 01:12:13 +01:00 |
|
Andrey Kleshchev
|
5e7a0a963e
|
SL-14190 moved sAvatarDictionary
|
2020-11-03 22:12:39 +02:00 |
|
Andrey Kleshchev
|
99d2ae5e02
|
SL-14190 sAvatarDictionary was not used
|
2020-10-26 18:47:12 +02:00 |
|
Ansariel
|
9b3cba1fa6
|
Merge viewer-eep except the usual screw-up
|
2019-08-27 19:18:05 +02:00 |
|
Ansariel
|
de837a5800
|
Merge Firestorm LGPL
|
2019-08-27 19:04:14 +02:00 |
|
Graham Linden
|
8f02fc8a66
|
Fix llavatarappearance merge to not use iterator in favor of C++11 lingo.
|
2019-08-26 13:23:25 -07:00 |
|
Graham Linden
|
723f1891db
|
Merge 6.3.1 viewer-release
|
2019-08-26 12:35:18 -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 |
|
Anchor
|
2cd1a22587
|
Merge
|
2019-03-05 21:25:24 -08:00 |
|
Ansariel
|
7fc586e2f2
|
Merge Firestorm LGPL
|
2019-03-01 19:12:02 +01:00 |
|
Brad Payne (Vir Linden)
|
2d3b805b94
|
SL-10471 - collision volume api
|
2019-02-06 13:44:54 +00:00 |
|
Brad Payne (Vir Linden)
|
b27ca1e68e
|
SL-10471 - collision volume api
|
2019-02-06 13:44:54 +00:00 |
|
Brad Payne (Vir Linden)
|
a77344516c
|
SL-10471 - animation validation for constraints
|
2019-02-05 21:38:00 +00:00 |
|
Brad Payne (Vir Linden)
|
84cca265e5
|
SL-10471 - animation validation for constraints
|
2019-02-05 21:38:00 +00:00 |
|
Ansariel
|
0e003a1780
|
Merge Firestorm LGPL
|
2018-12-06 19:44:58 +01:00 |
|
Ansariel
|
20494c8ee9
|
FIRE-23328: Improve extended script info by agent/group SLURLs & human-readable attachment point name
|
2018-12-03 23:39:14 +01:00 |
|
Anchor
|
014480a79b
|
Merge
|
2018-11-28 15:16:01 -08:00 |
|
Ansariel
|
f04189ed9f
|
Merge Firestorm LGPL
|
2018-11-17 01:03:38 +01:00 |
|
Anchor Linden
|
076719013e
|
Merge
|
2018-10-11 10:54:16 -07:00 |
|
Ansariel
|
b073ffbb52
|
Merge Firestorm LGPL
|
2018-09-27 22:45:40 +02:00 |
|
Brad Payne (Vir Linden)
|
a84ee929a5
|
merge
|
2018-09-27 19:54:10 +01:00 |
|
Ansariel
|
23fd31faf6
|
Merge Firestorm LGPL
|
2018-09-27 11:59:30 +02:00 |
|
Ansariel
|
9944015842
|
Merge viewer-baking-updates
|
2018-08-03 13:21:08 +02: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 |
|
Anchor Linden
|
dcbf57ab2d
|
[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.
|
2018-07-15 21:33:02 +05:30 |
|
Ansariel
|
457d9792c0
|
Merge axon
|
2018-07-15 12:32:06 +02:00 |
|
Brad Payne (Vir Linden)
|
d389f681b1
|
MAINT-8863 - more diagnostics to pin down possible causes
|
2018-07-12 18:10:19 +01:00 |
|
Ansariel
|
0de7d1c227
|
Merge viewer-baking-updates
|
2018-06-28 16:28:45 +02:00 |
|
Anchor Linden
|
8a13530ce4
|
[MAINT-8742] - fix color/tint on universal tattoos
|
2018-06-27 03:08:06 +05:30 |
|
Ansariel
|
4aa45cb8e1
|
Merge viewer-baking-updates
|
2018-06-16 13:22:49 +02:00 |
|
Anchor Linden
|
7abb0c99be
|
[DRTVWR-476] - add universal head,upper,lower tattoos
|
2018-06-13 01:09:27 +05:30 |
|
Ansariel
|
31b62685f2
|
Merge viewer-baking-updates
|
2018-05-22 17:23:58 +02:00 |
|
Anchor Linden
|
3bf89821d9
|
[DRTVWR-455] - added 5 new bake channels
|
2018-05-21 16:00:52 -07:00 |
|
Ansariel
|
89e753a81d
|
Merge Firestorm LGPL
|
2018-01-17 21:20:40 +01:00 |
|
Brad Payne (Vir Linden)
|
e36745eb98
|
merge
|
2018-01-17 16:06:27 +00:00 |
|
Ansariel
|
0669906f4b
|
Merge axon
|
2018-01-04 15:53:22 +01:00 |
|
Brad Payne (Vir Linden)
|
49d924ae29
|
MAINT-7528 - allow underscores to substitute for spaces in uploaded meshes - this allows rigging to some attachment points that will not otherwise work
|
2017-12-13 16:04:10 +00:00 |