Commit Graph

156 Commits (68a8141cd6627da5d209867a2b7d3359c42e25e6)

Author SHA1 Message Date
Ansariel 68a8141cd6 Merge bento-box 2016-10-04 12:49:38 +02:00
Ansariel ef3b8ad594 Merge bento-box 2016-09-28 14:45:26 +02:00
Brad Payne (Vir Linden) e6297ab3d6 SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette() 2016-09-27 17:29:22 -04:00
Nicky 44ab8b8f4b Merge with firestorm-lgpl. 2016-09-17 19:35:49 +02:00
Nicky 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
Brad Payne (Vir Linden) 6c46b3caf2 SL-395 - can enable/disable scale lock in mesh upload UI. Feature works. 2016-09-06 16:32:41 -04:00
Brad Payne (Vir Linden) 34ced1aa2c SL-395 - partial support for joint scale locking via flag in skin info 2016-09-02 16:44:57 -04:00
Ansariel 919521d121 Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Ansariel 472215b46c Merge bento-box 2016-04-14 14:29:20 +02:00
Brad Payne (Vir Linden) 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
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel be6ce75a96 Merge bento-box 2015-12-17 11:47:42 +01:00
Brad Payne (Vir Linden) 7b410df303 SL-124 WIP - cleanup of comments and test code before going to project viewer. 2015-11-25 15:07:26 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) fc74e02cde merge 2015-09-30 11:00:48 -04:00
Ansariel e861273da8 Merge viewer-loader-mods 2015-08-29 14:14:08 +02:00
Brad Payne (Vir Linden) 2ea8df0593 SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning. 2015-08-26 10:49:02 -04:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
andreykproductengine 1dd7e76908 Merge with viewer-release and become 3.7.28 2015-04-14 18:53:17 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
ruslantproductengine 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
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Oz Linden 23ec889631 changes to fix compiler warnings merged in from viewer-release 2015-01-13 14:54:35 -05:00
Brad Payne (Vir Linden) 7e962d3798 merge 2014-12-08 13:01:44 -05:00
ruslantproductengine b3c8a559f6 MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals. 2014-11-28 18:17:54 +02:00
Graham Linden a882d7a02b Fix for gpu_bench crash without parallels knock-on 2014-11-18 12:54:13 -08: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
ruslantproductengine 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
Ansariel cfc3d0ce8f A collection of fixes provided by Cinder Roxley 2015-02-28 17:35:52 +01:00
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
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Mnikolenko ProductEngine 79212e759b MAINT-4533 FIXED viewer crash when uploading shiprigging88b.dae 2014-10-20 11:11:45 +03: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 d7db567f27 MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads 2014-10-09 17:30:59 +03:00
Mnikolenko ProductEngine fa4fdedf51 MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads 2014-10-09 13:10:16 +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