7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
5af8f15a05
SL-14541 Replace zlib with zlib-ng
2021-09-08 23:18:07 +03:00
99027205df
FIRE-30965 Improve mesh upload error + rewrite subset checks
...
Rewrite material parsing to properly implement material subset with the NoGeometry tag.
2021-05-28 03:07:14 +01:00
7235799a02
SL-15183 Crash at LLModel::matchMaterialOrder
2021-04-29 09:00:57 +02:00
250212d614
SL-15183 Crash at LLModel::matchMaterialOrder
2021-04-29 00:11:25 +03:00
aba9a73193
SL-14993 Crash accessing mInvBindMatrix
2021-03-23 08:50:43 +01:00
9fc1b51ae8
SL-14993 Crash accessing mInvBindMatrix
2021-03-23 01:08:38 +02:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
e5ba5b7479
make mesh normals great again hack is now optional
2020-06-24 17:31:01 +01:00
0e623cc3b4
BUG-228952 - fix vertex normal scaling bug
2020-06-20 00:57:48 +01:00
32f1dfa531
[DRTVWR-476] - fix compiler errors 32 bit windows build
2020-03-25 18:44:04 -04:00
6ca7831872
Merge with viewer-vs2017
2019-06-27 10:14:49 +02:00
2c2bdcf348
[DRTVWR-476] - fix compiler errors 32 bit windows build
2019-06-10 15:56:44 -07:00
457d9792c0
Merge axon
2018-07-15 12:32:06 +02:00
73c76fdccf
MAINT-8863 - more diagnostics and possible fix
2018-07-13 18:56:08 +01:00
c1f3b20f55
Merge axon
2018-06-20 19:07:46 +02:00
edf6795eda
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
2018-06-13 21:49:24 +01:00
6862190500
SL-915 - face-level caching, bug fix
2018-06-08 19:56:34 +01:00
a2879b80a6
Merge Firestorm LGPL
2018-05-08 17:13:44 +02:00
8a81a43161
Merge.
2018-04-10 11:42:59 +02:00
4e598848f6
Out of bounds read: lod is not supposed to be bigger than MODEL_LODS-1 as there is only LOD values from [0,4].
2018-04-03 13:35:19 +02:00
9f8c6ace4a
merge
2018-03-02 13:00:18 +00:00
c8e654c61d
Merge axon
2018-03-02 11:04:21 +01:00
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
750d90cf59
MAINT-8208 [Mac] Viewer crashes when uploading certain mesh model after enabling "Include skin weight"
2018-01-22 18:11:12 +02:00
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
f727126c95
Merge viewer-bear
2018-01-25 21:55:38 +01:00
3e380c9a84
MAINT-8208 [Mac] Viewer crashes when uploading certain mesh model after enabling "Include skin weight"
2018-01-22 18:11:12 +02:00
7373226432
Back out old fix for FIRE-9251 that doesn't seem to work and make room for new fix from LL
2018-01-23 17:01:48 +01:00
c56298d4ba
MAINT-8022 Make unzip silent yet include failure reason into output
2018-01-03 16:30:57 +02:00
4fc012fbfa
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
47d6879578
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
5351c445a8
Merge Firestorm LGPL
2016-11-29 19:26:31 +01:00
416a46711d
MAINT-6901 safety checks fix
2016-11-21 22:58:07 +02:00
75eb1e6ca6
MAINT-6901 Linux build fix
2016-11-18 16:24:36 +02:00
4ae6f32ee1
MAINT-6901 Fixes upload assigning different scale to parts of the model
2016-11-15 20:16:01 +02:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
5dcd81c155
SL-451 - avoid more high-cost string operations in a per-frame function
2016-10-28 09:33:57 -04:00
6f1c696c2a
Merge bento-box
2016-10-26 19:45:02 +02:00
45ab1429b2
SL-395 - believed fix for intermittent problem uploading meshes with scale locks
2016-10-19 11:05:02 -04:00
c3eae7320a
MAINT-6901 safety checks fix
2016-11-21 22:58:07 +02:00
9e3f72e1d8
MAINT-6901 Linux build fix
2016-11-18 16:24:36 +02:00
4ab80645c6
MAINT-6901 Fixes upload assigning different scale to parts of the model
2016-11-15 20:16:01 +02:00
68a8141cd6
Merge bento-box
2016-10-04 12:49:38 +02:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
e6297ab3d6
SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette()
2016-09-27 17:29:22 -04:00
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
24308dc929
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
2016-09-16 21:46:39 +02:00
6c46b3caf2
SL-395 - can enable/disable scale lock in mesh upload UI. Feature works.
2016-09-06 16:32:41 -04:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
472215b46c
Merge bento-box
2016-04-14 14:29:20 +02:00
b138ca8aee
SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify.
2016-04-06 16:12:39 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
7b410df303
SL-124 WIP - cleanup of comments and test code before going to project viewer.
2015-11-25 15:07:26 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
fc74e02cde
merge
2015-09-30 11:00:48 -04:00
e861273da8
Merge viewer-loader-mods
2015-08-29 14:14:08 +02:00
2ea8df0593
SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning.
2015-08-26 10:49:02 -04:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
89321a56fd
increment viewer version to 3.7.29
2015-04-28 12:03:31 +03:00
1dd7e76908
Merge with viewer-release and become 3.7.28
2015-04-14 18:53:17 +03:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
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
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
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
b008385a50
FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
...
on OS X.
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.
Change'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
cfc3d0ce8f
A collection of fixes provided by Cinder Roxley
2015-02-28 17:35:52 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
79212e759b
MAINT-4533 FIXED viewer crash when uploading shiprigging88b.dae
2014-10-20 11:11:45 +03:00
edc844a74b
FIRE-12216; Make sure a model loaded from some DAE always has vertex normals.
2014-10-14 00:40:09 +02: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
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
7ce5dc613d
MAINT-3661 Fix for crash when uploading corrupt .dae file.
2014-01-27 16:09:07 -06: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
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
e8380dbc99
Merge viewer-bear (translations and avatar muting changes)
2013-09-19 00:03:46 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
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
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07: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
26bf0f4c3d
FIRE-9394; Do not access arrays beyond their end when loading a malformed dae file.
2013-03-07 06:28:01 +01:00
e412b7e10f
FIRE-9251; make sure there's no iterator used out of the maps valid range.
2013-02-18 23:11:03 +01:00
c5c358b03b
FIRE-8139/BUG-670 filter out models with invalid data in them.
2012-11-23 14:33:15 +01:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07: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
Ansariel