Andrey Kleshchev
|
1a17932440
|
DRTVWR-542 Automated method selection
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
|
2021-08-04 21:14:00 +03:00 |
|
Andrey Kleshchev
|
7235d333ea
|
DRTVWR-542 Fix incorect dropbox state
|
2021-08-04 00:15:49 +03:00 |
|
Andrey Kleshchev
|
2d2ed85c56
|
DRTVWR-542 Fix malfunctioning warning
|
2021-07-28 22:19:43 +03:00 |
|
Ansariel
|
c5246338bf
|
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-05-02 14:32:36 +02:00 |
|
Andrey Kleshchev
|
d0ac1505a7
|
SL-15102 Crash at load_face_from_dom_triangles
|
2021-04-13 00:40:00 +03:00 |
|
Ansariel
|
b834664d81
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-10-15 11:31:36 +02:00 |
|
Andrey Lihatskiy
|
14bf268fbb
|
Merge branch 'master' into DRTVWR-513-maint
|
2020-10-14 21:59:52 +03:00 |
|
Ansariel
|
f323e34b07
|
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
|
2020-09-23 06:53:16 +02:00 |
|
Andrey Kleshchev
|
bdedfb3755
|
SL-13566 'Use Joint Positions' Option causes collapsed Joints for some files
|
2020-08-28 21:01:48 +03:00 |
|
Ansariel
|
c5af669e3b
|
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
|
2020-08-12 12:24:35 +02:00 |
|
Andrey Kleshchev
|
3239f3518b
|
SL-13698 Mac build fix
|
2020-08-11 20:43:50 +03:00 |
|
Mnikolenko Productengine
|
7a9a114e16
|
SL-13698 FIXED crash on model upload
|
2020-08-03 19:14:09 +03:00 |
|
Ansariel
|
187b1e0d6e
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/llpanelpermissions.cpp
# indra/newview/llviewerregion.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_attachment_self.xml
# indra/newview/skins/default/xui/en/menu_avatar_self.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2020-07-09 10:08:42 +02:00 |
|
Andrey Kleshchev
|
da0024efec
|
SL-13426 Fixed crash at processDomModel
|
2020-07-06 16:48:59 +03:00 |
|
Ansariel
|
92e7843fcf
|
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmodelpreview.cpp
|
2020-04-25 17:26:59 +02:00 |
|
Andrey Kleshchev
|
9221c8a3f6
|
SL-13080 Changes for joint listings in mesh uploader
|
2020-04-23 20:51:06 +03: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 |
|
Ansariel
|
d30bb9b7c4
|
Merge Firestorm LGPL
|
2018-04-07 14:10:32 +02:00 |
|
Nicky
|
6888ade517
|
Linux: Create a safe and happy place for GCC when including glh_linear.h
|
2018-03-26 20:05:34 +02:00 |
|
Ansariel
|
c8e654c61d
|
Merge axon
|
2018-03-02 11:04:21 +01:00 |
|
Brad Payne (Vir Linden)
|
3f9b3e01b9
|
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
|
2018-02-21 22:02:34 +00:00 |
|
Ansariel
|
c606bc3492
|
Merge viewer-lynx
|
2017-11-12 12:28:28 +01:00 |
|
Ansariel
|
2f981013aa
|
Undo DAE file loader fix to make room for fix from LL
|
2017-11-01 14:35:53 +01:00 |
|
andreykproductengine
|
c8c8005e2f
|
MAINT-2161 Fixed dae parsing issue - dae expects escaped names
|
2017-10-31 16:41:39 +02:00 |
|
Ansariel
|
95fcf065c1
|
Merge viewer-bear
|
2017-04-19 21:43:58 +02:00 |
|
andreykproductengine
|
5ddac01ef2
|
MAINT-7058 Fixed missing extents for generated (split) faces
|
2017-04-14 17:13:57 +03:00 |
|
andreykproductengine
|
4fc012fbfa
|
Reverted changeset 409b67af8faf (MAINT-6901)
|
2016-12-23 15:16:50 +02:00 |
|
andreykproductengine
|
47d6879578
|
Reverted changeset 409b67af8faf (MAINT-6901)
|
2016-12-23 15:16:50 +02:00 |
|
AndreyL ProductEngine
|
2abd0eef41
|
Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
|
2016-12-05 21:51:29 +02:00 |
|
Ansariel
|
5351c445a8
|
Merge Firestorm LGPL
|
2016-11-29 19:26:31 +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 |
|
andreykproductengine
|
4ae6f32ee1
|
MAINT-6901 Fixes upload assigning different scale to parts of the model
|
2016-11-15 20:16:01 +02:00 |
|
Ansariel
|
42c77ab5bc
|
Merge Firestorm LGPL
|
2016-11-04 12:52:13 +01:00 |
|
Ansariel
|
6f1c696c2a
|
Merge bento-box
|
2016-10-26 19:45:02 +02:00 |
|
Ansariel
|
40c06f4836
|
Merge Firestorm LGPL
|
2016-10-22 20:30:54 +02:00 |
|
Brad Payne (Vir Linden)
|
a2fd408c9b
|
MAINT-6853 - fix for viewer crash when checking preview skin weights
|
2016-10-21 09:50:13 -04:00 |
|
andreykproductengine
|
4ab80645c6
|
MAINT-6901 Fixes upload assigning different scale to parts of the model
|
2016-11-15 20:16:01 +02:00 |
|
Mnikolenko Productengine
|
5d1f6223eb
|
MAINT-6835 Material of model is not a subset of reference, cause upload model dialog to stick with error
|
2016-10-20 16:15:36 +03:00 |
|
Ansariel
|
2cd7b679db
|
Merge Firestorm LGPL
|
2016-10-01 16:24:43 +02:00 |
|
Ansariel
|
ef3b8ad594
|
Merge bento-box
|
2016-09-28 14:45:26 +02:00 |
|
Nicky
|
44ab8b8f4b
|
Merge with firestorm-lgpl.
|
2016-09-17 19:35:49 +02:00 |
|
Nicky
|
24308dc929
|
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
|
2016-09-16 21:46:39 +02:00 |
|
Ansariel
|
e18d32ee13
|
Merge viewer-bear
|
2016-09-12 20:58:57 +02:00 |
|
Brad Payne (Vir Linden)
|
34ced1aa2c
|
SL-395 - partial support for joint scale locking via flag in skin info
|
2016-09-02 16:44:57 -04:00 |
|
andreykproductengine
|
c4e9fe9fe5
|
MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name
|
2016-08-25 15:40:33 +03:00 |
|
Ansariel
|
304b9726de
|
Merge Firestorm LGPL
|
2016-08-15 16:42:36 +02:00 |
|
Brad Payne (Vir Linden)
|
57da9bcd1b
|
merge from viewer-release
|
2016-08-15 09:52:06 -04:00 |
|
Ansariel
|
0054c93c3f
|
Merge Firestorm LGPL
|
2016-08-11 00:17:47 +02:00 |
|
Ansariel
|
1e521a042c
|
Merge Firestorm LGPL
|
2016-08-10 21:25:45 +02:00 |
|
Ansariel
|
7976aaa668
|
Merge Firestorm LGPL
|
2016-08-10 20:40:20 +02:00 |
|
Ansariel
|
a42cb70200
|
FIRE-19806: Mesh upload from a folder with Unicode characters in the name fails
|
2016-08-09 12:11:45 +02:00 |
|
Mnikolenko Productengine
|
30c420d288
|
MAINT-6835 Material of model is not a subset of reference, cause upload model dialog to stick with error
|
2016-10-20 16:15:36 +03:00 |
|
Ansariel
|
88b928e1dd
|
Merge bento-box
|
2016-06-16 00:53:56 +02:00 |
|
Brad Payne (Vir Linden)
|
d2302886bc
|
MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now.
|
2016-06-15 15:24:54 -04:00 |
|
Ansariel
|
b2fcb3fdc5
|
Merge viewer-bear
|
2016-05-18 20:37:40 +02:00 |
|
andreykproductengine
|
5048402da8
|
MAINT-5786 FIXED Redundant sibling index suffix on uploaded mesh object names.
|
2016-05-12 17:46:20 +03:00 |
|
Ansariel
|
5404f6382e
|
Merge bento-box
|
2016-04-23 12:01:35 +02:00 |
|
Brad Payne (Vir Linden)
|
0447fe5a57
|
SL-371 - increased the limit for StackWalker strings, avoid crashing if mesh has wrong number of mAlternateBindMatrix matrices
|
2016-04-20 13:18:56 -04:00 |
|
Brad Payne (Vir Linden)
|
b092147a0b
|
SL-372 - handle dae models with multiple skeleton roots
|
2016-04-19 11:48:06 -04:00 |
|
Ansariel
|
03369ddba1
|
Merge bento-box
|
2016-04-02 01:48:09 +02:00 |
|
Ansariel
|
f45a4e38e5
|
Merge Firestorm LGPL
|
2016-04-02 00:43:29 +02:00 |
|
Nicky
|
e71f62e0b9
|
Merge.
|
2016-04-01 18:37:30 +02:00 |
|
Ansariel
|
c13eec6cfe
|
Merge Firestorm LGPL
|
2016-03-21 20:48:39 +01:00 |
|
Brad Payne (Vir Linden)
|
2afde26d93
|
merge
|
2016-03-21 11:00:22 -04:00 |
|
Ansariel
|
72da98408a
|
Merge Firestorm LGPL
|
2016-02-24 23:39:19 +01:00 |
|
Ansariel
|
4519783ced
|
Correct / restore Drake's mesh importer fix
|
2016-02-19 11:07:11 +01:00 |
|
Ansariel
|
a0fa2e5762
|
Merge viewer-bear
|
2016-02-19 10:30:02 +01:00 |
|
AndreyL ProductEngine
|
8920beabc4
|
MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed
|
2016-02-17 03:01:04 +02:00 |
|
AndreyL ProductEngine
|
72685fe1cb
|
MAINT-6132 Fixed error on uploading models with texture
|
2016-02-17 02:40:58 +02:00 |
|
Ansariel
|
e7ade840e4
|
Merge viewer-bear
|
2016-01-24 14:00:30 +01:00 |
|
Ansariel
|
15378fd3f8
|
Merge Firestorm LGPL
|
2016-01-16 03:56:53 +01:00 |
|
Brad Payne (Vir Linden)
|
3612d7d14b
|
merge
|
2016-01-15 16:42:39 -05:00 |
|
Ansariel
|
be6ce75a96
|
Merge bento-box
|
2015-12-17 11:47:42 +01:00 |
|
andreykproductengine
|
cb23a99610
|
MAINT-5956 FIXED Certain dae will not upload with the new importer code
|
2015-12-10 19:28:26 +02:00 |
|
andreykproductengine
|
18f4ad27b6
|
MAINT-5956 FIXED Certain dae will not upload with the new importer code
|
2015-12-10 19:28:26 +02:00 |
|
AndreyL ProductEngine
|
97dbd3768a
|
MAINT-5678 [Importer] Buildfix for Linux and OSX
|
2015-12-11 20:17:59 +02:00 |
|
AndreyL ProductEngine
|
dca797c3db
|
MAINT-5678 [Importer] materials with spaces in name import with truncated names
|
2015-12-08 02:52:15 +02:00 |
|
AndreyL ProductEngine
|
a9fff9a868
|
Backed out changeset: de52f1d38f3c
|
2015-12-10 23:21:56 +02:00 |
|
Ansariel
|
4fde94fa86
|
Merge viewer-bear
|
2015-11-13 21:15:19 +01:00 |
|
Aura Linden
|
99219cbe80
|
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
|
2015-11-13 04:12:13 -08:00 |
|
Aura Linden
|
146919fa76
|
animations and meshes will recognize all joint names in joint_aliases.xml
|
2015-11-11 13:44:51 -08:00 |
|
andreykproductengine
|
080e26eba4
|
MAINT-5728 fix for dae uploading crash
|
2015-11-11 19:37:36 +02:00 |
|
Brad Payne (Vir Linden)
|
b72480ddb9
|
SL-114 WIP - made mesh upload errors/warnings slightly more informative and less spammy.
|
2015-11-10 15:52:41 -05:00 |
|
Brad Payne (Vir Linden)
|
be11d020ca
|
SL-266 WIP - removed obsolete rigParityWithScene code, set legacy and joint offset upload based on AND-ing state of all meshes in file.
|
2015-11-09 14:57:00 -05:00 |
|
Brad Payne (Vir Linden)
|
3cf938bcec
|
SL-124 WIP - BENTO comments and related cleanup
|
2015-11-04 16:41:37 -05:00 |
|
Brad Payne (Vir Linden)
|
ded9b10d5d
|
SL-114 WIP - constrain uploaded meshes based on max joints per mesh. Set max joints per mesh to 110. Also fixed some uninitialized members of LLModelLoader.
|
2015-10-29 16:09:22 -04:00 |
|
Aura Linden
|
07496b015b
|
Pulled merge from bento prime.
|
2015-10-27 15:33:21 -07:00 |
|
Aura Linden
|
97374a5362
|
Fixes SL-202 joint offset and skin weight import. Race condition still exists.
|
2015-10-27 15:15:34 -07:00 |
|
Brad Payne (Vir Linden)
|
bfa3f83a2c
|
merge
|
2015-10-19 16:34:13 -04:00 |
|
Brad Payne (Vir Linden)
|
58992e2cb4
|
SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered.
|
2015-10-16 15:05:29 -04:00 |
|
Aura Linden
|
8729f5d23a
|
Bandaid for SL-202 Skin weights with joint offsets.
|
2015-10-13 16:40:39 -07:00 |
|
AndreyL ProductEngine
|
ddaa0e1865
|
MAINT-5678 FIXED Materials with spaces in name import with truncated names
|
2015-10-12 19:35:08 +03:00 |
|
Brad Payne (Vir Linden)
|
ebad0c6868
|
DRTVWR-412 WIP - more work for importer merge from viewer-release
|
2015-10-01 11:05:29 -04:00 |
|
andreykproductengine
|
1d22db9ed8
|
MAINT-5532 related crash fix and some log improvements
|
2015-08-26 21:00:57 +03:00 |
|
AndreyL ProductEngine
|
cb30550a28
|
MAINT-5678 FIXED Materials with spaces in name import with truncated names
|
2015-10-12 19:35:08 +03:00 |
|
Ansariel
|
852eec31c3
|
Bug fixes in mesh importer by Drake Arconis
|
2015-10-06 13:10:29 +02:00 |
|
Ansariel
|
2a99e0f9d2
|
Oooops...
|
2015-09-29 23:29:05 +02:00 |
|
Ansariel
|
79d41cac7f
|
Put Nicky's fix for FIRE-12216 in its new location
|
2015-08-29 18:26:24 +02:00 |