97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
250212d614
SL-15183 Crash at LLModel::matchMaterialOrder
2021-04-29 00:11:25 +03:00
9fc1b51ae8
SL-14993 Crash accessing mInvBindMatrix
2021-03-23 01:08:38 +02:00
32f1dfa531
[DRTVWR-476] - fix compiler errors 32 bit windows build
2020-03-25 18:44:04 -04:00
73c76fdccf
MAINT-8863 - more diagnostics and possible fix
2018-07-13 18:56:08 +01: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
9f8c6ace4a
merge
2018-03-02 13:00:18 +00: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
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
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02: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
5dcd81c155
SL-451 - avoid more high-cost string operations in a per-frame function
2016-10-28 09:33:57 -04:00
45ab1429b2
SL-395 - believed fix for intermittent problem uploading meshes with scale locks
2016-10-19 11:05:02 -04:00
e6297ab3d6
SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette()
2016-09-27 17:29:22 -04: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
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04: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
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
2ea8df0593
SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning.
2015-08-26 10:49:02 -04: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
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
Andrey Kleshchev