Commit Graph

108 Commits (abfe05c1b3d24ed820cf084ece3f3610ec35fa21)

Author SHA1 Message Date
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
andreykproductengine 1dd7e76908 Merge with viewer-release and become 3.7.28 2015-04-14 18:53:17 +03:00
ruslantproductengine b3c8a559f6 MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals. 2014-11-28 18:17:54 +02:00
ruslantproductengine 799d13269a MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
Mnikolenko ProductEngine 79212e759b MAINT-4533 FIXED viewer crash when uploading shiprigging88b.dae 2014-10-20 11:11:45 +03:00
Mnikolenko ProductEngine d7db567f27 MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads 2014-10-09 17:30:59 +03:00
Richard Linden e298325bed MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue in llmanipscale.cpp
This was an out of bounds array access on a code path not normally accessed
To test, set debug setting ScaleShowAxes to true, go into build mode, and hold down Ctrl+Shift to scale an object
There should be colored bars along the scale axes, limited to the bounds of the object's extents
2014-09-23 19:12:35 -07:00
Graham Linden 297aefd933 Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk 2014-08-29 11:29:37 -07:00
Graham Linden 76e7f978c1 Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?) 2014-07-07 17:59:07 -07: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
Graham Linden a815ad481a Mergeup to 3.7.9 viewer-release 2014-05-29 04:54:58 -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
Graham Linden ae035a0d66 Modify importer to (optionally) improve debug output, perform name-based LOD association, and handle models with many materials. 2014-04-22 08:58:38 -07:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04: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
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
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
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
prep c37603d9ce fix for sh-1847: Removed assert when a vert is outside [-5,5] domain 2011-07-20 14:05:13 -04: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