e8380dbc99
Merge viewer-bear (translations and avatar muting changes)
2013-09-19 00:03:46 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
0723683e83
Added Karl Stiefvater's mesh deformer, patch contributed by Inworldz LLC, updated for post-SSA Firestorm
...
*Only OpenSim enabled at this point
2013-07-11 13:31:12 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
968567346a
MAINT-1028 Fix for gcc
2012-12-11 17:56:01 -06:00
a073fa4009
MAINT-1028 Fix for crash when importing meshes produced by FBX converter
2012-12-11 16:27:58 -06:00
26bf0f4c3d
FIRE-9394; Do not access arrays beyond their end when loading a malformed dae file.
2013-03-07 06:28:01 +01:00
e412b7e10f
FIRE-9251; make sure there's no iterator used out of the maps valid range.
2013-02-18 23:11:03 +01:00
c5c358b03b
FIRE-8139/BUG-670 filter out models with invalid data in them.
2012-11-23 14:33:15 +01:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
0b16411d30
assert fix for mempyNonAliased16 call
2012-01-26 14:07:37 -05:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
2df669c402
Log error message if material list is not a subset of reference model
2011-08-30 10:46:41 -04:00
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
df94d0c778
Fixes for sh-2039, sh-1336, and sh-2044. Vertices were having incorrect weights assigned.
2011-08-03 17:01:34 -04:00
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
c37603d9ce
fix for sh-1847: Removed assert when a vert is outside [-5,5] domain
2011-07-20 14:05:13 -04:00
561d40d5c3
SH-715 Disable simplify/analyze button while counterpart is executing.
2011-07-14 01:07:01 -05:00
dc7100a63f
SH-2008 Fix for crash when generating normals on objects with no texture coordinates.
2011-07-08 23:21:51 -05:00
2a6e18d147
SH-1774 Fix for preserving material assignments between multiple custom LoDs.
2011-07-07 18:32:42 -05:00
9b253ccf68
SH-1972 Fix for slm messing up physics shape on second upload.
2011-07-06 19:27:43 -05:00
71eb68a85d
Fix for "set to default" button not resetting some data.
2011-07-06 18:54:50 -05:00
12e08417bf
SH-1169 Fix for convex decompositions not working post mesh-asset-deprecation work. (also default SLM usage to on)
2011-06-28 12:41:12 -05:00
f83b08b69c
fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during LLModelPreview::genLODs;
...
SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae";
SH-1890: Crash loading palm tree
2011-06-24 15:09:10 -06:00
b0fdc44951
SH-1815 Fix for crash when using old version slm
2011-06-22 16:08:23 -05:00
ce02ed3118
SH-1880 partial fix for crashing on daes without UVs.
2011-06-20 18:55:30 -05:00
27fb647fd1
merge
2011-06-18 01:02:25 -05:00
15235061e8
SH-828 Fix for using uninitialized data when normals or texture coordinates are absent from collada file (can now upload meshes without normals or texture coordinates).
2011-06-18 01:02:03 -05:00
0bb7bcc96c
fix for SH-1788: Assert in texture load when uploading textured mesh model
...
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15 16:20:33 -06:00
44f0a1b681
SH-1778 Physics shape display fix up.
2011-06-11 16:51:01 -05:00
ca5a87b819
merge
2011-06-08 15:59:11 -05:00
dbd619508b
Fix for importer crashes, sh-1698. Added checks for handling bad elements in the dae.
2011-06-07 16:53:29 -04:00
faf9693be3
Make basehull assert even more forgiving (only error out on 10% over bounds).
2011-06-07 00:10:24 -05:00
a58e70261e
SH-101 Fix for asset when uploading some models.
2011-06-06 19:27:47 -05:00
9793f6c51d
Add "NoGeometry" identifier support to viewer.
2011-06-06 16:54:15 -05:00
f4722b3905
merge
2011-06-03 00:15:56 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
9d80bee277
merge
2011-05-25 16:09:46 -04:00
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
10c45691c7
merge
2011-05-18 13:41:38 -05:00
e237f5733c
SH-914 Fix for normals getting screwed up by non-uniform model normalization.
2011-05-18 01:30:21 -05:00
3acc3d39f0
Put back "PositionDomain" and "Min"/"Max" on convex decomposition.
2011-05-11 19:13:18 -05:00
ca0a568264
SH-1497 Don't upload physics mesh if decomposition exists.
2011-05-05 18:33:03 -05:00
3c516973f3
SH-1497 "Positions" not "Position" for convex decomp.
2011-05-05 17:12:41 -05:00
9cb31845ba
SH-1497 Update mesh asset parser to use new format restrictions.
2011-05-04 20:45:14 -05:00
d7954ba38f
fix for SH-688: Viewer crash when uploading a large .dae file and clicking the X button in upper right hand corner of the upload model floater on Mac Build
2011-04-29 15:23:03 -06:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
6a49142467
Remove some asserts that cause the physics shape display to error out on occasion.
2011-04-15 14:12:12 -05:00
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
3a08499572
merge
2011-03-30 18:41:34 -05:00
6b9a2d24cc
SH-477 Better mesh streaming cost estimation.
2011-03-30 18:38:22 -05:00
73bf43b593
line ending fixes
2011-03-30 10:49:14 -04:00
719610e68b
SH-1225 Import convex hull data from .slm
2011-03-29 11:50:02 -05:00
1ff7968312
SH-1225 Add skinning info to import path of .slm files.
2011-03-28 23:50:23 -05:00
51a4867ae6
SH-1168 Export upload data to disk on upload.
2011-03-21 17:31:25 -05:00
16ff507190
WIP:Added pelvis offset to skinning info
2011-03-14 18:02:25 -04:00
4abb8b33fa
sh-517 Content authors can specify a pivot node (Assetpivot).
2011-02-28 12:20:31 -05:00
32d3d2e050
SH-749 FIX: check for zero-extent to avoid div by zero
2011-01-20 14:49:05 -05:00
f41b53059e
SH-508 Fix for frame stalls when adjusting skin weights.
2010-12-30 16:46:56 -06:00
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
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
be1fd73390
CTS-320 SH-465 FIX use system zlib for standalone builds
...
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
3a1fbcab2a
SH-448 Initial draft of implementing UI spec for "advanced" importer.
2010-11-19 17:07:01 -06:00
278dac7ce7
Reverting code for fixing non-uniform scale for mesh uploads as it breaks rigged meshes.
2010-11-02 16:25:29 -07:00
dda21d67e5
Fix for CTS-305 'Uploaded meshes have uniform scale'
2010-10-28 14:32:00 -07:00
57cbcdc9ec
Adding back in fix for convex hull size incompatibility after backout of previous checkin.
2010-10-26 11:20:48 -07:00
0a8d43e844
Backing out latest change to undo static cache file changes
2010-10-26 11:11:20 -07:00
e4a5d16be1
Fixed convex hull size incompatibility in mesh assets.
2010-10-26 10:31:48 -07:00
0aba56e2db
CTS-320 (part 3 of 3) use system zlib for standalone
2010-10-25 11:39:56 +02:00
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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
24e0d62a5e
Added mandatory single hull simplification to mesh upload.
2010-10-06 01:17:12 -05:00
1f00747cd2
Post review cleanup.
2010-10-05 16:55:19 -05:00
87a9f47575
Rewrite LLPhysicsDecomp to have a more generic callback system.
...
Reviewed by prep.
2010-10-05 16:49:05 -05:00
23b4dc6189
Fix for serialization deprecation problems.
2010-09-29 18:10:27 -05:00
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
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
c7f5a9419b
Added support for joint offsets
2010-09-24 13:11:53 -04:00
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
7d625ef060
merge
2010-09-22 01:44:44 -05:00
d40db3d8e1
SH-100, SH-111 Fix for generate normals stalling/crashing.
...
Switch from "new" to "malloc" in llvolume.cpp aligned arrays so "realloc" can be used to avoid copies.
2010-09-22 01:43:17 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
771195865c
CTS-219 Fix for broken geometry when importing from polygons.
2010-08-26 18:36:25 -05:00
71de5f622a
Add missing files from viewer-experimental
2010-08-26 14:23:12 -05:00
Tank_Master