Commit Graph

425 Commits (cd47f86c4ab6dd2bdeb98db06acd64d02cdff96f)

Author SHA1 Message Date
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -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
AndreyL ProductEngine eb413ec41e Merged in lindenlab/viewer-release 2016-04-01 03:56:20 +03: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
andreykproductengine 2d41b4fe30 MAINT-6160 Fix for ImporterLegacyMatching crash 2016-02-23 18:30:29 +02:00
AndreyL ProductEngine 8920beabc4 MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed 2016-02-17 03:01:04 +02:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
andreykproductengine 97f85329e4 MAINT-5064 FIXED Mesh upload attempt causes viewer to freeze 2015-11-19 17:31:21 +02: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
Brad Payne (Vir Linden) 3607d71740 MAINT-5807 WIP - show skin weights checkbox also not properly initialized. 2015-11-04 08:50:19 -05:00
Oz Linden 31abaa8f1a correct merge error spotted by Ansariel 2015-10-27 11:14:33 -04:00
AndreyL ProductEngine 03f07b3ecc Merge downstream code, version 3.8.6 2015-10-15 23:01:12 +03:00
Rider Linden 53b947e039 Merge from viewer release. 2015-10-19 12:03:08 -07:00
andreykproductengine 4d536f8955 Merge from viewer release 2015-09-30 22:47:14 +03:00
AndreyL ProductEngine f64a10ca8f Merge downstream code, version 3.8.5 2015-09-30 01:21:04 +03:00
Rider Linden 2fe0c32109 DRTVWR-409: merge DRTVWR-368 2015-09-29 14:16:58 -07:00
AndreyL ProductEngine 182f799281 MAINT-5601 Physics model not previewed, physics model not applied to mesh on upload
Some improvements: renaming to act like "legacy matching" would apply only to the models simple enough for this
2015-09-15 23:43:43 +03:00
AndreyL ProductEngine 0eba128741 MAINT-5601 FIXED Physics model not previewed, physics model not applied to mesh on upload 2015-09-11 00:15:53 +03:00
AndreyL ProductEngine 9ce8f7bfb4 MAINT-5602 FIXED Viewer crashes when loading physics from file
--HG--
branch : develop
2015-09-07 02:59:36 +03:00
andreykproductengine 1d22db9ed8 MAINT-5532 related crash fix and some log improvements 2015-08-26 21:00:57 +03:00
Rider Linden 96bb17f20b Merge 2015-08-25 11:40:36 -07:00
Mnikolenko ProductEngine 7215b2f236 build fix 2015-08-27 16:33:09 +03:00
vyacheslavsproductengine ad67f1899c MAINT-5064 FIXED (Mesh upload attempt causes viewer crash) (replacing BBox generation) 2015-08-25 17:24:24 +04:00
andreykproductengine b3916451c1 Merge viewer-release and become version 3.8.4 2015-08-18 18:51:38 +03:00
Rider Linden 2fc4ddb92b Added a couple LL_WARNS to track why upload button disabled. 2015-07-17 15:58:03 -07:00
vyacheslavsproductengine cfe009cbf6 MAINT-4761 FIXED viewer crash (Crash after selecting 'Skin weights' checkbox when uploading the second model.) 2015-06-01 21:02:35 +04:00
vyacheslavsproductengine 1491c23d9b MAINT-4761 FIXED viewer crash (Crash after selecting 'Skin weights' checkbox when uploading the second model.) 2015-06-01 21:02:35 +04:00
andreykproductengine b90b1ccca0 MAINT-5209 FIXED Cannot upload some models with high level of detail 2015-05-22 18:15:24 +03:00
andreykproductengine 695ff76cb7 MAINT-5214 FIXED physics layer isn't shown in the Preview Window while uploading model 2015-05-18 17:55:34 +03:00
andreykproductengine 4f236dd7e8 Cleaning out unused variables. 2015-05-05 19:30:28 +03:00
andreykproductengine 0faa19e03d Linux build fix 2015-05-05 17:38:01 +03:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
andreykproductengine a89f3f29a0 MAINT-4796 FIXED Crash in LLModelLoader::loadFromSLM 2015-04-24 20:30:26 +03:00
andreykproductengine 1382e9bae6 MAINT-5112 Separating legacy matching method 2015-04-23 16:28:15 +03:00
andreykproductengine 2c178d3fb0 MAINT-5115 [Project-Importer] Materials with > 21844 triangles cause chaos in models with > 8 materials. 2015-04-22 16:54:58 +03:00
andreykproductengine 1dd7e76908 Merge with viewer-release and become 3.7.28 2015-04-14 18:53:17 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
andreykproductengine 3e0483df17 MAINT-4483 FIXED Mesh uploader allows Low LODs to have more triangles than High LODs 2015-04-10 15:15:08 +03:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
ruslantproductengine 06f50c52e1 MAINT-3818 FIXED Certain dae files that used to display skin weights successfully now crash when ticking skin weights in model preview on ALL viewers 2015-04-01 19:02:55 +03:00
ruslantproductengine 802302a31c MAINT-3818 FIXED Certain dae files that used to display skin weights successfully now crash when ticking skin weights in model preview on ALL viewers 2015-03-26 18:05:47 +02:00