Commit Graph

183 Commits (9740887b90791b3fad37e58ab9e2ac772e8d2e95)

Author SHA1 Message Date
simon@Simon-PC.lindenlab.com 7d6ea9814e ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed
by Kelly
2011-09-27 09:32:36 -07:00
Brad Payne (Vir Linden) 4b269f67ea merge 2011-09-14 14:54:20 -04:00
prep linden 2df669c402 Log error message if material list is not a subset of reference model 2011-08-30 10:46:41 -04: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
Leslie Linden 4b2ba7236f Merge from viewer-experience 2011-08-22 11:41:18 -07:00
Brad Payne (Vir Linden) af8864c49c merge 2011-08-19 09:41:50 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Brad Payne (Vir Linden) 6732f5fbca merge viewer-development to mesh-development 2011-08-10 17:53:11 -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
prep c37603d9ce fix for sh-1847: Removed assert when a vert is outside [-5,5] domain 2011-07-20 14:05:13 -04:00
Brad Payne (Vir Linden) 564087f6b0 addendum to prim fix 2011-07-19 15:33:43 -04:00
Brad Payne (Vir Linden) 8b7e33ad36 Cherry pick of https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions 2011-07-19 15:19:07 -04:00
Don Kjer e8b71e0585 Changed mesh param type to not conflict with one in-use on server 2011-07-18 18:57:40 -07:00
Don Kjer f376ec167c Adding support for viewer reading mesh params from an alternative param type. 2011-07-18 18:50:57 -07:00
Dave Parks 561d40d5c3 SH-715 Disable simplify/analyze button while counterpart is executing. 2011-07-14 01:07:01 -05:00
Dave Parks dc7100a63f SH-2008 Fix for crash when generating normals on objects with no texture coordinates. 2011-07-08 23:21:51 -05: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
Dave Parks 71eb68a85d Fix for "set to default" button not resetting some data. 2011-07-06 18:54:50 -05:00
Dave Parks 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
Xiaohong Bao 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
Dave Parks b0fdc44951 SH-1815 Fix for crash when using old version slm 2011-06-22 16:08:23 -05:00
Dave Parks ce02ed3118 SH-1880 partial fix for crashing on daes without UVs. 2011-06-20 18:55:30 -05:00
Dave Parks 27fb647fd1 merge 2011-06-18 01:02:25 -05:00
Dave Parks 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
Xiaohong Bao 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
Dave Parks 44f0a1b681 SH-1778 Physics shape display fix up. 2011-06-11 16:51:01 -05:00
Dave Parks ca5a87b819 merge 2011-06-08 15:59:11 -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
Dave Parks faf9693be3 Make basehull assert even more forgiving (only error out on 10% over bounds). 2011-06-07 00:10:24 -05:00
Dave Parks a58e70261e SH-101 Fix for asset when uploading some models. 2011-06-06 19:27:47 -05:00
Dave Parks 9793f6c51d Add "NoGeometry" identifier support to viewer. 2011-06-06 16:54:15 -05:00
Dave Parks f4722b3905 merge 2011-06-03 00:15:56 -05:00
Dave Parks 3a409e6edc SH-1603 Replace every occurrence of "WTF" with something more appropriate. 2011-05-25 18:45:21 -05:00
Brad Payne (Vir Linden) 9d80bee277 merge 2011-05-25 16:09:46 -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 10c45691c7 merge 2011-05-18 13:41:38 -05:00
Dave Parks e237f5733c SH-914 Fix for normals getting screwed up by non-uniform model normalization. 2011-05-18 01:30:21 -05:00
Dave Parks 3acc3d39f0 Put back "PositionDomain" and "Min"/"Max" on convex decomposition. 2011-05-11 19:13:18 -05:00
Dave Parks ca0a568264 SH-1497 Don't upload physics mesh if decomposition exists. 2011-05-05 18:33:03 -05:00
Dave Parks 3c516973f3 SH-1497 "Positions" not "Position" for convex decomp. 2011-05-05 17:12:41 -05:00
Dave Parks 9cb31845ba SH-1497 Update mesh asset parser to use new format restrictions. 2011-05-04 20:45:14 -05:00
Xiaohong Bao 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