Ansariel
|
fee815a45d
|
Merge bento-box
|
2016-08-25 11:29:06 +02:00 |
|
Brad Payne (Vir Linden)
|
d23bb7e056
|
MAINT-6647 - make SLM behavior still available if MeshImportUseSLM is true; still defaults to false.
|
2016-08-19 09:47:26 -04:00 |
|
Brad Payne (Vir Linden)
|
1e6d9ba4be
|
MAINT-6647 - make SLM files even more dead.
|
2016-08-18 11:31:16 -04: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 |
|
Brad Payne (Vir Linden)
|
f47ceb47bb
|
merged jelly-doll viewer-release into bento
|
2016-05-21 08:15:28 -04:00 |
|
Ansariel
|
8d123edb56
|
Merge Firestorm LGPL
|
2016-05-09 14:15:08 +02:00 |
|
Ansariel
|
62b508ed7e
|
Merge bento-box
|
2016-05-09 13:15:50 +02:00 |
|
Brad Payne (Vir Linden)
|
2d8b53854e
|
merge
|
2016-05-06 11:00:47 -04:00 |
|
Oz Linden
|
950c41d184
|
merge 4.0.4-release and MAINT-5974
|
2016-05-06 10:28:42 -04:00 |
|
Brad Payne (Vir Linden)
|
ec471497f5
|
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
|
2016-04-29 11:25:17 -04:00 |
|
Ansariel
|
706eb3b3de
|
Merge Firestorm LGPL
|
2016-04-14 15:08:28 +02:00 |
|
Ansariel
|
2441b2b5c5
|
Merge Firestorm LGPL
|
2016-04-14 14:32:24 +02:00 |
|
Ansariel
|
472215b46c
|
Merge bento-box
|
2016-04-14 14:29:20 +02:00 |
|
Ansariel
|
82695084b2
|
Merge Firestorm LGPL tip
|
2016-04-13 08:18:42 +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
|
298fa0828e
|
Remove code duplication caused by merge with 4.0.3
|
2016-04-05 11:25:01 +02:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Ansariel
|
10a4cc5f98
|
Merge Firestorm LGPL
|
2016-04-02 02:54:16 +02:00 |
|
Ansariel
|
f45a4e38e5
|
Merge Firestorm LGPL
|
2016-04-02 00:43:29 +02:00 |
|
Brad Payne (Vir Linden)
|
caf4f49437
|
merge
|
2016-04-01 08:35:38 -04:00 |
|
Nicky
|
a50faa943c
|
Merge.
|
2016-04-01 12:59:37 +02:00 |
|
AndreyL ProductEngine
|
eb413ec41e
|
Merged in lindenlab/viewer-release
|
2016-04-01 03:56:20 +03:00 |
|
Ansariel
|
356b838823
|
Remove duplicated code in llfloatermodelpreview.cpp
|
2016-04-05 18:15:08 +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
|
1bba3dfbe4
|
Merge viewer-bear
|
2016-03-17 21:14:49 +01:00 |
|
Rider Linden
|
b8c1976460
|
Merge
|
2016-03-17 13:14:21 -07:00 |
|
andreykproductengine
|
ef73114ede
|
MAINT-6227 FIXED Crash on mesh upload
|
2016-03-17 15:55:27 +02:00 |
|
Oz Linden
|
31f3db0291
|
merge changes for DRTVWR-417
|
2016-03-16 13:08:06 -04:00 |
|
Oz Linden
|
5822fb00b6
|
merge DRTVWR-398 build cleanup fixes
|
2016-03-07 12:41:11 -05:00 |
|
Ansariel
|
51f8b1ec7b
|
Merge viewer-bear
|
2016-02-26 21:34:32 +01:00 |
|
andreykproductengine
|
2d41b4fe30
|
MAINT-6160 Fix for ImporterLegacyMatching crash
|
2016-02-23 18:30:29 +02: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 |
|
Ansariel
|
e7ade840e4
|
Merge viewer-bear
|
2016-01-24 14:00:30 +01:00 |
|
Nicky
|
6b0da7af72
|
Merge.
|
2016-01-17 01:05:13 +01:00 |
|
Ansariel
|
15378fd3f8
|
Merge Firestorm LGPL
|
2016-01-16 03:56:53 +01:00 |
|
Oz Linden
|
bc22e58743
|
merge changes for 4.0.1-release
|
2016-01-15 16:55:04 -05:00 |
|
Brad Payne (Vir Linden)
|
3612d7d14b
|
merge
|
2016-01-15 16:42:39 -05:00 |
|
Rider Linden
|
e7eaa94dfa
|
Merge VR
|
2016-01-15 13:36:38 -08:00 |
|
Ansariel
|
41bf131956
|
Merge Firestorm LGPL
|
2015-12-22 20:52:10 +01:00 |
|
Nicky
|
4b7fb09a47
|
Merge.
|
2015-12-21 19:16:34 +01:00 |
|
Ansariel
|
b761b7e10e
|
Merge Firestorm LGPL
|
2015-12-20 21:05:54 +01:00 |
|
Ansariel
|
be6ce75a96
|
Merge bento-box
|
2015-12-17 11:47:42 +01:00 |
|
Brad Payne (Vir Linden)
|
c964633a35
|
SL-271 WIP - skip rendering bones with no end (set as 0 length). Show bones if show joints is enabled in mesh upload preview.
|
2015-11-23 14:52:07 -05:00 |
|
andreykproductengine
|
97f85329e4
|
MAINT-5064 FIXED Mesh upload attempt causes viewer to freeze
|
2015-11-19 17:31:21 +02: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 |
|
Oz Linden
|
9848fc4253
|
merge changes for 4.0.1-release
|
2016-01-15 17:01:16 -05:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |