Commit Graph

52 Commits (405f5c879c44f32635dcb94de2c7dfb9e4a8673a)

Author SHA1 Message Date
andreykproductengine 4fc012fbfa 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
andreykproductengine 75eb1e6ca6 MAINT-6901 Linux build fix 2016-11-18 16:24:36 +02:00
andreykproductengine 4ae6f32ee1 MAINT-6901 Fixes upload assigning different scale to parts of the model 2016-11-15 20:16:01 +02:00
Brad Payne (Vir Linden) 5dcd81c155 SL-451 - avoid more high-cost string operations in a per-frame function 2016-10-28 09:33:57 -04:00
Brad Payne (Vir Linden) 45ab1429b2 SL-395 - believed fix for intermittent problem uploading meshes with scale locks 2016-10-19 11:05:02 -04:00
Brad Payne (Vir Linden) 8230a9937f MAINT-6841 - removed the joint remapping code, since it was designed to support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code. 2016-10-18 16:05:35 -04:00
Brad Payne (Vir Linden) e6297ab3d6 SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette() 2016-09-27 17:29:22 -04:00
Brad Payne (Vir Linden) 6c46b3caf2 SL-395 - can enable/disable scale lock in mesh upload UI. Feature works. 2016-09-06 16:32:41 -04: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
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -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) 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
Graham Linden a815ad481a Mergeup to 3.7.9 viewer-release 2014-05-29 04:54:58 -07:00
Graham Linden ae035a0d66 Modify importer to (optionally) improve debug output, perform name-based LOD association, and handle models with many materials. 2014-04-22 08:58:38 -07:00
simon 5687b0c4df Merge 2013-05-09 15:30:49 -07:00
Dave Parks dbfcd6c9c5 Optimization -- don't draw glow in alpha pool unless needed 2013-05-07 17:20:33 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep linden 71ac45a28b Handling of material mismatches - lod materials are required to be a subset of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts 2011-08-30 09:32:16 -04:00
prep df94d0c778 Fixes for sh-2039, sh-1336, and sh-2044. Vertices were having incorrect weights assigned. 2011-08-03 17:01:34 -04:00
prep linden fdcf43e0b3 merge 2011-07-29 17:50:20 -04:00
prep linden c013c3ab53 Removed joint Positional Compare because it was crashing on some rigs 2011-07-29 17:44:42 -04:00
nyx 0713e8c97a BUILDFIX: fixing build for linux, casting doubles as parameters to abs 2011-07-29 17:21:27 -04:00
nyx 9d44be1903 merging in PE's fixes for new UI to mesh-development.
Included are upload floater tweaks, build panel tweaks,
and removing the mesh enabled checkbox in region tools.
2011-07-29 15:56:51 -04:00
prep 7fc12cd43d Fix for sh-2044, sh-2039 and sh-2166 (Avatar weights were sometimes not correctly applied upon import. 2011-07-28 16:09:17 -04:00
seth_productengine 50b9c63382 SH-1868 WIP Added user-supplied metric data for uploading a model.
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.

The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-22 22:40:18 +03:00
Dave Parks 2a6e18d147 SH-1774 Fix for preserving material assignments between multiple custom LoDs. 2011-07-07 18:32:42 -05:00
Dave Parks 9b253ccf68 SH-1972 Fix for slm messing up physics shape on second upload. 2011-07-06 19:27:43 -05:00
prep linden dbd619508b Fix for importer crashes, sh-1698. Added checks for handling bad elements in the dae. 2011-06-07 16:53:29 -04:00
Xiaohong Bao f5726a094d fix for
SH-712:Asset error given on upload of duck.dae using High LOD for physics shape - Analyze seems to not complete;
SH-889: Viewer crash when analyzing physics LOD;
SH-890: Viewer crash on Exit after analyzing physics layer which never seems to complete
2011-05-24 17:36:06 -06:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Xiaohong Bao f0c70a4ee3 fix for SH-1176: A Mesh That Crashes Client on Upload Attempt (due to triangle number overflowing) 2011-04-01 10:58:34 -06:00
Dave Parks 6b9a2d24cc SH-477 Better mesh streaming cost estimation. 2011-03-30 18:38:22 -05:00
Dave Parks 719610e68b SH-1225 Import convex hull data from .slm 2011-03-29 11:50:02 -05:00
Dave Parks 1ff7968312 SH-1225 Add skinning info to import path of .slm files. 2011-03-28 23:50:23 -05:00
Dave Parks 51a4867ae6 SH-1168 Export upload data to disk on upload. 2011-03-21 17:31:25 -05:00
prep 16ff507190 WIP:Added pelvis offset to skinning info 2011-03-14 18:02:25 -04:00
prep linden 4abb8b33fa sh-517 Content authors can specify a pivot node (Assetpivot). 2011-02-28 12:20:31 -05:00
Dave Parks e1b1db9575 SH-636 Update physics tab to new spec, move "completed" physics decomp callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform. 2010-12-22 01:05:35 -06:00
Brad Payne (Vir Linden) 5f8110a68e SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed 2010-12-14 15:52:26 -05:00
Dave Parks 3a1fbcab2a SH-448 Initial draft of implementing UI spec for "advanced" importer. 2010-11-19 17:07:01 -06:00
Jonathan Wolk 256c6e6a25 Moved retry logic for certain mesh header fetches to help with SH-323 'Some mesh objects fail to load data for valid meshes'. Renamed some variables to be more clear. 2010-10-19 11:29:42 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 24e0d62a5e Added mandatory single hull simplification to mesh upload. 2010-10-06 01:17:12 -05:00
Dave Parks 87a9f47575 Rewrite LLPhysicsDecomp to have a more generic callback system.
Reviewed by prep.
2010-10-05 16:49:05 -05:00
Dave Parks 613894c8cc SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
Remove llfloaterimportcollada

Reviewed by Prep.
2010-09-28 13:45:42 -05:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
prep linden c7f5a9419b Added support for joint offsets 2010-09-24 13:11:53 -04:00
Dave Parks cf09d6c58a Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. 2010-09-22 03:04:21 -05:00