Commit Graph

156 Commits (d64babaeebf301232b812e2be5461d6a32f5491f)

Author SHA1 Message Date
prep a6a8426147 merge 2011-05-05 11:30:22 -04:00
Xiaohong Bao a776a11ea6 Automated merge with http://hg.secondlife.com/mesh-development 2011-05-05 09:02:23 -06:00
prep linden 91980918f0 Fix for Sh-1481 2011-05-04 17:18:31 -04:00
Xiaohong Bao 905fc03e5d fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer. 2011-05-04 10:11:39 -06: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
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Xiaohong Bao e07d21639b a try fix for SH-1307: Crash on selection of some meshes. 2011-04-19 13:41:05 -06:00
prep c494e5c0d5 WIP for SH-1281. Rigged assets are critiqued differently based upon whether they're avrigs w/wo joint offets and whether the asset contains a subset of the joints in the visual scene 2011-04-18 10:41:32 -04:00
Leyla Farazha 0dd0758ab9 SH-1269: Using SLM breaks upload model wizard 2011-04-01 15:05:17 -07:00
Brad Payne (Vir Linden) 793ff1c94a merge 2011-04-01 16:49:27 -04:00
Brad Payne (Vir Linden) 1ccb583181 added defaults button to reset model upload dialog from .dae file 2011-04-01 16:47:59 -04:00
Xiaohong Bao e04b7f007f Automated merge with http://hg.secondlife.com/mesh-development 2011-04-01 10:59:30 -06:00
Xiaohong Bao 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
prep linden b97c47c19c Removed unused variable 2011-04-01 12:57:45 -04:00
Dave Parks 3a08499572 merge 2011-03-30 18:41:34 -05:00
Dave Parks 6b9a2d24cc SH-477 Better mesh streaming cost estimation. 2011-03-30 18:38:22 -05:00
prep 69789e40d9 Moved joint reset flag into model preview 2011-03-30 16:04:36 -04:00
prep 5aeac734bc Comment update 2011-03-30 15:04:51 -04:00
prep 080c5fe083 Update skin instances pelvisoffset for each lod 2011-03-30 15:03:05 -04:00
prep dd71a9faac Fix for SH-1177 - Allowable range for an alternate pivot is -64 to 64 2011-03-30 14:05:23 -04:00
Brad Payne (Vir Linden) 865efe9af6 merge 2011-03-30 10:36:27 -04:00
Leyla Farazha ac4e4607b8 Merge 2011-03-29 16:33:47 -07:00
Leyla Farazha e69aa18c0d SH-1247 Upload Wizard should pull in textures, if defined in .dae 2011-03-29 16:32:28 -07:00
Dave Parks 719610e68b SH-1225 Import convex hull data from .slm 2011-03-29 11:50:02 -05:00
Dave Parks c44fe35125 merge 2011-03-28 23:52:21 -05:00
Dave Parks 1ff7968312 SH-1225 Add skinning info to import path of .slm files. 2011-03-28 23:50:23 -05:00
prep 040a28952f merge 2011-03-28 17:50:32 -04:00
prep 86f3c3f276 Fix for issue caused by uploading the TurboSquid book collection (that avatar was having it's joints reet) 2011-03-28 17:50:12 -04:00
Leyla Farazha 7c993e4490 fixing line endings in llfloatermodelpreview.cpp 2011-03-28 13:16:34 -07:00
Leyla Farazha ae086d95fa Merge 2011-03-28 13:15:49 -07:00
Leyla Farazha 7c27fd2037 fixing unused LLComboBox issue that was causing mac/linux breakage 2011-03-28 13:12:47 -07:00
prep 115f051003 WIP pelvis z offset can be adjusted between -3 to +3 2011-03-28 11:12:14 -04:00
Leyla Farazha 3528753a3a SH-1104 Add additional panel before review step. 2011-03-25 14:10:35 -07:00
prep d2bb490702 Crash fix for SH-1176 and WIP for pelvis z offset 2011-03-24 09:48:34 -04:00
Brad Payne (Vir Linden) e711e8af3d SH-1168 WIP: Disable SLM save if MeshImportUseSLM not set 2011-03-23 17:33:53 -04:00
Dave Parks 6ff87e2840 SH-1169 Import from slm instead of dae when appropriate. 2011-03-22 17:23:48 -05:00
Dave Parks 51a4867ae6 SH-1168 Export upload data to disk on upload. 2011-03-21 17:31:25 -05:00
Dave Parks 9c1c791b29 Merge indentation fix up. 2011-03-17 17:35:51 -05:00
Dave Parks 2cf093f04e Merge 2011-03-17 17:34:49 -05:00
Dave Parks 77869c9c1d SH-587 Fix for crash when clicking cancel in model importer. 2011-03-17 17:17:31 -05:00
prep linden 359d049430 Added support for handling an asset that contains a skeletal node which has no root node for the scene (yuck). Fix for an upload issue w/simplebot 2011-03-17 17:25:52 -04:00
prep linden aaaddfe089 Fix for SH-1017. We now disallow malformed rigs to be uploaded (i.e. missing bones, improperly names bones etc...) 2011-03-16 17:09:30 -04:00
prep linden 5a940793e1 WIP:Manual pelvis offset 2011-03-16 10:15:06 -04:00
prep bc54afb907 WIP: manual pelvis offset for rigs that contain bone offsets 2011-03-14 16:17:34 -04:00
Dave Parks a135831c84 SH-632 Fix for inconsistent decimation results and off by one errors causing decimations where none are needed. 2011-03-09 23:15:31 -06:00
Dave Parks c2bdb9be14 SH-706 Make triangle limit and error threshold spinners respond to arrow clicks. 2011-03-09 18:19:12 -06:00
Dave Parks d1a2ce75e2 SH-587 Make cancel button on physics tabs more responsive. 2011-03-09 14:18:39 -06:00
prep linden 4abb8b33fa sh-517 Content authors can specify a pivot node (Assetpivot). 2011-02-28 12:20:31 -05:00
leyla_linden ca52b0bd71 SH-1040 Make both model preview drop downs functional 2011-02-24 15:02:55 -08:00
leyla_linden b0e64098ba Merge 2011-02-23 16:38:45 -08:00