ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
3641541c6c
SL-15756 Removed mHasGeneratedFaces
...
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-11-15 23:23:09 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
ca629c362c
SL-15965 Support wider range of parsing errors
2021-09-09 21:17:00 +03:00
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
7235d333ea
DRTVWR-542 Fix incorect dropbox state
2021-08-04 00:15:49 +03:00
2d2ed85c56
DRTVWR-542 Fix malfunctioning warning
2021-07-28 22:19:43 +03:00
c5246338bf
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-02 14:32:36 +02:00
d0ac1505a7
SL-15102 Crash at load_face_from_dom_triangles
2021-04-13 00:40:00 +03:00
b834664d81
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 11:31:36 +02:00
14bf268fbb
Merge branch 'master' into DRTVWR-513-maint
2020-10-14 21:59:52 +03:00
f323e34b07
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-09-23 06:53:16 +02:00
bdedfb3755
SL-13566 'Use Joint Positions' Option causes collapsed Joints for some files
2020-08-28 21:01:48 +03:00
c5af669e3b
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-12 12:24:35 +02:00
3239f3518b
SL-13698 Mac build fix
2020-08-11 20:43:50 +03:00
7a9a114e16
SL-13698 FIXED crash on model upload
2020-08-03 19:14:09 +03:00
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
da0024efec
SL-13426 Fixed crash at processDomModel
2020-07-06 16:48:59 +03:00
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
9221c8a3f6
SL-13080 Changes for joint listings in mesh uploader
2020-04-23 20:51:06 +03:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
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
d30bb9b7c4
Merge Firestorm LGPL
2018-04-07 14:10:32 +02:00
6888ade517
Linux: Create a safe and happy place for GCC when including glh_linear.h
2018-03-26 20:05:34 +02:00
c8e654c61d
Merge axon
2018-03-02 11:04:21 +01:00
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
2f981013aa
Undo DAE file loader fix to make room for fix from LL
2017-11-01 14:35:53 +01:00
c8c8005e2f
MAINT-2161 Fixed dae parsing issue - dae expects escaped names
2017-10-31 16:41:39 +02:00
95fcf065c1
Merge viewer-bear
2017-04-19 21:43:58 +02:00
5ddac01ef2
MAINT-7058 Fixed missing extents for generated (split) faces
2017-04-14 17:13:57 +03:00
4fc012fbfa
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
47d6879578
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
5351c445a8
Merge Firestorm LGPL
2016-11-29 19:26:31 +01:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
4ae6f32ee1
MAINT-6901 Fixes upload assigning different scale to parts of the model
2016-11-15 20:16:01 +02:00
42c77ab5bc
Merge Firestorm LGPL
2016-11-04 12:52:13 +01:00
6f1c696c2a
Merge bento-box
2016-10-26 19:45:02 +02:00
40c06f4836
Merge Firestorm LGPL
2016-10-22 20:30:54 +02:00
a2fd408c9b
MAINT-6853 - fix for viewer crash when checking preview skin weights
2016-10-21 09:50:13 -04:00
4ab80645c6
MAINT-6901 Fixes upload assigning different scale to parts of the model
2016-11-15 20:16:01 +02:00
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
2cd7b679db
Merge Firestorm LGPL
2016-10-01 16:24:43 +02:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
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
e18d32ee13
Merge viewer-bear
2016-09-12 20:58:57 +02:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
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
304b9726de
Merge Firestorm LGPL
2016-08-15 16:42:36 +02:00
57da9bcd1b
merge from viewer-release
2016-08-15 09:52:06 -04:00
0054c93c3f
Merge Firestorm LGPL
2016-08-11 00:17:47 +02:00
1e521a042c
Merge Firestorm LGPL
2016-08-10 21:25:45 +02:00
7976aaa668
Merge Firestorm LGPL
2016-08-10 20:40:20 +02:00
a42cb70200
FIRE-19806: Mesh upload from a folder with Unicode characters in the name fails
2016-08-09 12:11:45 +02:00
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
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02:00
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
b2fcb3fdc5
Merge viewer-bear
2016-05-18 20:37:40 +02:00
5048402da8
MAINT-5786 FIXED Redundant sibling index suffix on uploaded mesh object names.
2016-05-12 17:46:20 +03:00
5404f6382e
Merge bento-box
2016-04-23 12:01:35 +02:00
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
b092147a0b
SL-372 - handle dae models with multiple skeleton roots
2016-04-19 11:48:06 -04:00
03369ddba1
Merge bento-box
2016-04-02 01:48:09 +02:00
f45a4e38e5
Merge Firestorm LGPL
2016-04-02 00:43:29 +02:00
e71f62e0b9
Merge.
2016-04-01 18:37:30 +02:00
c13eec6cfe
Merge Firestorm LGPL
2016-03-21 20:48:39 +01:00
2afde26d93
merge
2016-03-21 11:00:22 -04:00
72da98408a
Merge Firestorm LGPL
2016-02-24 23:39:19 +01:00
4519783ced
Correct / restore Drake's mesh importer fix
2016-02-19 11:07:11 +01:00
a0fa2e5762
Merge viewer-bear
2016-02-19 10:30:02 +01:00
8920beabc4
MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed
2016-02-17 03:01:04 +02:00
72685fe1cb
MAINT-6132 Fixed error on uploading models with texture
2016-02-17 02:40:58 +02:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
15378fd3f8
Merge Firestorm LGPL
2016-01-16 03:56:53 +01:00
3612d7d14b
merge
2016-01-15 16:42:39 -05:00
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
cb23a99610
MAINT-5956 FIXED Certain dae will not upload with the new importer code
2015-12-10 19:28:26 +02:00
18f4ad27b6
MAINT-5956 FIXED Certain dae will not upload with the new importer code
2015-12-10 19:28:26 +02:00
97dbd3768a
MAINT-5678 [Importer] Buildfix for Linux and OSX
2015-12-11 20:17:59 +02:00
dca797c3db
MAINT-5678 [Importer] materials with spaces in name import with truncated names
2015-12-08 02:52:15 +02:00
a9fff9a868
Backed out changeset: de52f1d38f3c
2015-12-10 23:21:56 +02:00
4fde94fa86
Merge viewer-bear
2015-11-13 21:15:19 +01:00
99219cbe80
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
2015-11-13 04:12:13 -08:00
146919fa76
animations and meshes will recognize all joint names in joint_aliases.xml
2015-11-11 13:44:51 -08:00
080e26eba4
MAINT-5728 fix for dae uploading crash
2015-11-11 19:37:36 +02:00
b72480ddb9
SL-114 WIP - made mesh upload errors/warnings slightly more informative and less spammy.
2015-11-10 15:52:41 -05:00
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
3cf938bcec
SL-124 WIP - BENTO comments and related cleanup
2015-11-04 16:41:37 -05:00
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
07496b015b
Pulled merge from bento prime.
2015-10-27 15:33:21 -07:00
97374a5362
Fixes SL-202 joint offset and skin weight import. Race condition still exists.
2015-10-27 15:15:34 -07:00
bfa3f83a2c
merge
2015-10-19 16:34:13 -04:00
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
8729f5d23a
Bandaid for SL-202 Skin weights with joint offsets.
2015-10-13 16:40:39 -07:00
Ansariel