23ec889631
changes to fix compiler warnings merged in from viewer-release
2015-01-13 14:54:35 -05:00
7e962d3798
merge
2014-12-08 13:01:44 -05:00
b3c8a559f6
MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals.
2014-11-28 18:17:54 +02:00
a882d7a02b
Fix for gpu_bench crash without parallels knock-on
2014-11-18 12:54:13 -08:00
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
79212e759b
MAINT-4533 FIXED viewer crash when uploading shiprigging88b.dae
2014-10-20 11:11:45 +03:00
d7db567f27
MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads
2014-10-09 17:30:59 +03:00
fa4fdedf51
MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads
2014-10-09 13:10:16 +03:00
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
297aefd933
Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk
2014-08-29 11:29:37 -07:00
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
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
c464a11958
MAINT-4123 FIXED return LLModel::BAD_ELEMENT for mesh with empty tex coords array
2014-06-06 11:44:58 +03:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
a815ad481a
Mergeup to 3.7.9 viewer-release
2014-05-29 04:54:58 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
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
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
27044252fc
MAINT-3661 Fix for crash when uploading corrupt .dae file.
2014-01-27 16:09:07 -06:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
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
0e3ad3e94b
MAINT-3153 fix potential mis-indexing in DAE loading checks
2013-09-16 12:11:58 -07:00
d38bcb6621
MAINT-2388 replace stomped fix to not crash when handed bogus model data
2013-09-16 09:40:58 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
5687b0c4df
Merge
2013-05-09 15:30:49 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
dbfcd6c9c5
Optimization -- don't draw glow in alpha pool unless needed
2013-05-07 17:20:33 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
4b67d34c7e
Remove redundant data validation copy-pasted into normals loop
2013-03-07 15:45:29 -08:00
2e8b2558b4
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
2013-03-07 14:13:14 -08:00
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
968567346a
MAINT-1028 Fix for gcc
2012-12-11 17:56:01 -06:00
a073fa4009
MAINT-1028 Fix for crash when importing meshes produced by FBX converter
2012-12-11 16:27:58 -06:00
0b16411d30
assert fix for mempyNonAliased16 call
2012-01-26 14:07:37 -05:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
2df669c402
Log error message if material list is not a subset of reference model
2011-08-30 10:46:41 -04:00
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
df94d0c778
Fixes for sh-2039, sh-1336, and sh-2044. Vertices were having incorrect weights assigned.
2011-08-03 17:01:34 -04:00
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
c37603d9ce
fix for sh-1847: Removed assert when a vert is outside [-5,5] domain
2011-07-20 14:05:13 -04:00
561d40d5c3
SH-715 Disable simplify/analyze button while counterpart is executing.
2011-07-14 01:07:01 -05:00
dc7100a63f
SH-2008 Fix for crash when generating normals on objects with no texture coordinates.
2011-07-08 23:21:51 -05:00
2a6e18d147
SH-1774 Fix for preserving material assignments between multiple custom LoDs.
2011-07-07 18:32:42 -05:00
9b253ccf68
SH-1972 Fix for slm messing up physics shape on second upload.
2011-07-06 19:27:43 -05:00
71eb68a85d
Fix for "set to default" button not resetting some data.
2011-07-06 18:54:50 -05:00
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
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
b0fdc44951
SH-1815 Fix for crash when using old version slm
2011-06-22 16:08:23 -05:00
ce02ed3118
SH-1880 partial fix for crashing on daes without UVs.
2011-06-20 18:55:30 -05:00
27fb647fd1
merge
2011-06-18 01:02:25 -05:00
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
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
44f0a1b681
SH-1778 Physics shape display fix up.
2011-06-11 16:51:01 -05:00
ca5a87b819
merge
2011-06-08 15:59:11 -05:00
dbd619508b
Fix for importer crashes, sh-1698. Added checks for handling bad elements in the dae.
2011-06-07 16:53:29 -04:00
faf9693be3
Make basehull assert even more forgiving (only error out on 10% over bounds).
2011-06-07 00:10:24 -05:00
a58e70261e
SH-101 Fix for asset when uploading some models.
2011-06-06 19:27:47 -05:00
9793f6c51d
Add "NoGeometry" identifier support to viewer.
2011-06-06 16:54:15 -05:00
f4722b3905
merge
2011-06-03 00:15:56 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
9d80bee277
merge
2011-05-25 16:09:46 -04:00
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
10c45691c7
merge
2011-05-18 13:41:38 -05:00
e237f5733c
SH-914 Fix for normals getting screwed up by non-uniform model normalization.
2011-05-18 01:30:21 -05:00
3acc3d39f0
Put back "PositionDomain" and "Min"/"Max" on convex decomposition.
2011-05-11 19:13:18 -05:00
ca0a568264
SH-1497 Don't upload physics mesh if decomposition exists.
2011-05-05 18:33:03 -05:00
3c516973f3
SH-1497 "Positions" not "Position" for convex decomp.
2011-05-05 17:12:41 -05:00
9cb31845ba
SH-1497 Update mesh asset parser to use new format restrictions.
2011-05-04 20:45:14 -05:00
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
764412f9b5
merge
2011-04-22 11:50:19 -05:00
6a49142467
Remove some asserts that cause the physics shape display to error out on occasion.
2011-04-15 14:12:12 -05:00
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
3a08499572
merge
2011-03-30 18:41:34 -05:00
6b9a2d24cc
SH-477 Better mesh streaming cost estimation.
2011-03-30 18:38:22 -05:00
73bf43b593
line ending fixes
2011-03-30 10:49:14 -04:00
719610e68b
SH-1225 Import convex hull data from .slm
2011-03-29 11:50:02 -05:00
1ff7968312
SH-1225 Add skinning info to import path of .slm files.
2011-03-28 23:50:23 -05:00
51a4867ae6
SH-1168 Export upload data to disk on upload.
2011-03-21 17:31:25 -05:00
16ff507190
WIP:Added pelvis offset to skinning info
2011-03-14 18:02:25 -04:00
4abb8b33fa
sh-517 Content authors can specify a pivot node (Assetpivot).
2011-02-28 12:20:31 -05:00
32d3d2e050
SH-749 FIX: check for zero-extent to avoid div by zero
2011-01-20 14:49:05 -05:00
f41b53059e
SH-508 Fix for frame stalls when adjusting skin weights.
2010-12-30 16:46:56 -06:00
e1b1db9575
SH-636 Update physics tab to new spec, move "completed" physics decomp callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
2010-12-22 01:05:35 -06:00
5f8110a68e
SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed
2010-12-14 15:52:26 -05:00
be1fd73390
CTS-320 SH-465 FIX use system zlib for standalone builds
...
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
3a1fbcab2a
SH-448 Initial draft of implementing UI spec for "advanced" importer.
2010-11-19 17:07:01 -06:00
278dac7ce7
Reverting code for fixing non-uniform scale for mesh uploads as it breaks rigged meshes.
2010-11-02 16:25:29 -07:00
dda21d67e5
Fix for CTS-305 'Uploaded meshes have uniform scale'
2010-10-28 14:32:00 -07:00
57cbcdc9ec
Adding back in fix for convex hull size incompatibility after backout of previous checkin.
2010-10-26 11:20:48 -07:00
0a8d43e844
Backing out latest change to undo static cache file changes
2010-10-26 11:11:20 -07:00
e4a5d16be1
Fixed convex hull size incompatibility in mesh assets.
2010-10-26 10:31:48 -07:00
0aba56e2db
CTS-320 (part 3 of 3) use system zlib for standalone
2010-10-25 11:39:56 +02:00
256c6e6a25
Moved retry logic for certain mesh header fetches to help with SH-323 'Some mesh objects fail to load data for valid meshes'. Renamed some variables to be more clear.
2010-10-19 11:29:42 -07:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
24e0d62a5e
Added mandatory single hull simplification to mesh upload.
2010-10-06 01:17:12 -05:00
1f00747cd2
Post review cleanup.
2010-10-05 16:55:19 -05:00
87a9f47575
Rewrite LLPhysicsDecomp to have a more generic callback system.
...
Reviewed by prep.
2010-10-05 16:49:05 -05:00
Oz Linden