Commit Graph

119 Commits (e52d57cba26ba1dfce6f28b31e531eaed1a965a6)

Author SHA1 Message Date
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Brad Payne (Vir Linden) 7e962d3798 merge 2014-12-08 13:01:44 -05:00
Graham Linden a882d7a02b Fix for gpu_bench crash without parallels knock-on 2014-11-18 12:54:13 -08:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Nicky edc844a74b FIRE-12216; Make sure a model loaded from some DAE always has vertex normals. 2014-10-14 00:40:09 +02:00
Mnikolenko ProductEngine fa4fdedf51 MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads 2014-10-09 13:10:16 +03:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Mnikolenko ProductEngine c464a11958 MAINT-4123 FIXED return LLModel::BAD_ELEMENT for mesh with empty tex coords array 2014-06-06 11:44:58 +03:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Tank_Master 6095a2072d more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL) 2014-06-10 08:01:16 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Dave Parks 7ce5dc613d MAINT-3661 Fix for crash when uploading corrupt .dae file. 2014-01-27 16:09:07 -06:00
Dave Parks 27044252fc MAINT-3661 Fix for crash when uploading corrupt .dae file. 2014-01-27 16:09:07 -06:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Graham Linden 29216ac5e7 MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease. 2013-09-23 13:43:01 -07:00
Graham Linden 0e3ad3e94b MAINT-3153 fix potential mis-indexing in DAE loading checks 2013-09-16 12:11:58 -07:00
Graham Linden d38bcb6621 MAINT-2388 replace stomped fix to not crash when handed bogus model data 2013-09-16 09:40:58 -07:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
simon 5687b0c4df Merge 2013-05-09 15:30:49 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Dave Parks dbfcd6c9c5 Optimization -- don't draw glow in alpha pool unless needed 2013-05-07 17:20:33 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham) 4b67d34c7e Remove redundant data validation copy-pasted into normals loop 2013-03-07 15:45:29 -08:00
Graham Madarasz (Graham) 2e8b2558b4 For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936 2013-03-07 14:13:14 -08:00
Graham Madarasz 1816582b92 Fix crashes from using single alloc for pos/norm/tc in volume face data fighting with old free call in model loading code 2013-03-06 09:09:07 -08:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master e8380dbc99 Merge viewer-bear (translations and avatar muting changes) 2013-09-19 00:03:46 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master 831e4f443b Merge LL 3.6.3 pass 1 2013-08-26 17:09:27 -07:00
Ansariel 992118ffc9 Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak 2013-08-10 01:15:44 +02:00
Cinders 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
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Dave Parks 968567346a MAINT-1028 Fix for gcc 2012-12-11 17:56:01 -06:00
Dave Parks a073fa4009 MAINT-1028 Fix for crash when importing meshes produced by FBX converter 2012-12-11 16:27:58 -06:00
Nicky 26bf0f4c3d FIRE-9394; Do not access arrays beyond their end when loading a malformed dae file. 2013-03-07 06:28:01 +01:00
Nicky e412b7e10f FIRE-9251; make sure there's no iterator used out of the maps valid range. 2013-02-18 23:11:03 +01:00
Nicky c5c358b03b FIRE-8139/BUG-670 filter out models with invalid data in them. 2012-11-23 14:33:15 +01:00
Oz Linden 97d969a338 initial attempt to restore changes that make removing tcmalloc possible; not tested 2012-09-12 14:36:37 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Brad Payne (Vir Linden) 0b16411d30 assert fix for mempyNonAliased16 call 2012-01-26 14:07:37 -05:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08: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
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