Commit Graph

548 Commits (eb06fba7679704a7870e3d91f2166bf7e63e5641)

Author SHA1 Message Date
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
Ansariel 18dfdc2ae0 Merge bento-box 2016-11-11 16:00:37 +01:00
Ansariel 42c77ab5bc Merge Firestorm LGPL 2016-11-04 12:52:13 +01: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
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
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
andreykproductengine c3eae7320a MAINT-6901 safety checks fix 2016-11-21 22:58:07 +02:00
andreykproductengine 9e3f72e1d8 MAINT-6901 Linux build fix 2016-11-18 16:24:36 +02:00
andreykproductengine 4ab80645c6 MAINT-6901 Fixes upload assigning different scale to parts of the model 2016-11-15 20:16:01 +02:00
Ansariel a0c253bb78 Merge bento-box 2016-10-19 00:16:24 +02: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
Ansariel 68a8141cd6 Merge bento-box 2016-10-04 12:49:38 +02: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
Brad Payne (Vir Linden) e6297ab3d6 SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette() 2016-09-27 17:29:22 -04: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) 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
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 fee815a45d Merge bento-box 2016-08-25 11:29:06 +02:00
Brad Payne (Vir Linden) 72d5ff36f5 MAINT-6647 - ignore previously created slm files on model upload. SL-442 - change coloring for show bones, to highlight joint positions and rigging 2016-08-17 16:31:28 -04: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 f68896905b Merge Firestorm LGPL 2016-05-23 16:09:09 +02: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 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
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +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 472215b46c Merge bento-box 2016-04-14 14:29:20 +02:00
Brad Payne (Vir Linden) b138ca8aee SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify. 2016-04-06 16:12:39 -04:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -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