Commit Graph

99 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
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