summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2016-05-21merged jelly-doll viewer-release into bentoBrad Payne (Vir Linden)
2016-05-06mergeBrad Payne (Vir Linden)
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-04-29SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh ↵Brad Payne (Vir Linden)
import. dae_tool.py work to enable joint offset tweaking.
2016-04-06SL-366 - more cases where skinned weights can go awry, and a bunch more ↵Brad Payne (Vir Linden)
asserts to verify.
2016-04-05Remove code duplication caused by merge with 4.0.3Ansariel
2016-04-04merge with 4.0.3-releaseOz Linden
2016-04-01mergeBrad Payne (Vir Linden)
2016-04-01Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-03-21mergeBrad Payne (Vir Linden)
2016-03-17MergeRider Linden
2016-03-17MAINT-6227 FIXED Crash on mesh uploadandreykproductengine
2016-03-16merge changes for DRTVWR-417Oz Linden
2016-03-07merge DRTVWR-398 build cleanup fixesOz Linden
2016-02-23MAINT-6160 Fix for ImporterLegacyMatching crashandreykproductengine
2016-02-17MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE ↵AndreyL ProductEngine
preprocessing when needed
2016-01-15merge changes for 4.0.1-releaseOz Linden
2016-01-15mergeBrad Payne (Vir Linden)
2016-01-15Merge VRRider Linden
2015-11-23SL-271 WIP - skip rendering bones with no end (set as 0 length). Show bones ↵Brad Payne (Vir Linden)
if show joints is enabled in mesh upload preview.
2015-11-19MAINT-5064 FIXED Mesh upload attempt causes viewer to freezeandreykproductengine
2015-11-13Eliminated joint_offset file. Added aliases attrib to bones in ↵Aura Linden
avatar_skeleton.xml.
2015-11-11animations and meshes will recognize all joint names in joint_aliases.xmlAura Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-11-09SL-266 WIP - removed obsolete rigParityWithScene code, set legacy and joint ↵Brad Payne (Vir Linden)
offset upload based on AND-ing state of all meshes in file.
2015-11-04SL-114 WIP - show skin weights checkbox can get out of sync with ↵Brad Payne (Vir Linden)
corresponding view option.
2015-11-04MAINT-5807 WIP - show skin weights checkbox also not properly initialized.Brad Payne (Vir Linden)
2015-10-29SL-114 WIP - constrain uploaded meshes based on max joints per mesh. Set max ↵Brad Payne (Vir Linden)
joints per mesh to 110. Also fixed some uninitialized members of LLModelLoader.
2015-10-27Pulled merge from bento prime.Aura Linden
2015-10-27Fixes SL-202 joint offset and skin weight import. Race condition still exists.Aura Linden
2015-10-27correct merge error spotted by AnsarielOz Linden
2015-10-21SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap ↵Brad Payne (Vir Linden)
weights where needed. Warn that related debug settings require restart to take effect.
2015-10-15Merge downstream code, version 3.8.6AndreyL ProductEngine
2015-10-19Merge from viewer release.Rider Linden
2015-10-12mergeBrad Payne (Vir Linden)
2015-10-07SL-234 WIP - adjust max mesh object joints at run-time, including rebuilding ↵Brad Payne (Vir Linden)
shaders
2015-10-01DRTVWR-412 WIP - more work for importer merge from viewer-releaseBrad Payne (Vir Linden)
2015-09-30Merge from viewer releaseandreykproductengine
2015-09-30mergeBrad Payne (Vir Linden)
2015-09-30Merge downstream code, version 3.8.5AndreyL ProductEngine
2015-09-29DRTVWR-409: merge DRTVWR-368Rider Linden
2015-09-28SL-227 WIP - standardize usage of shared skinning code and handle additional ↵Brad Payne (Vir Linden)
error case in weights.
2015-09-24SL-227 WIP - initial pass at consolidating skinning code. Less duplication ↵Brad Payne (Vir Linden)
of functionality, still needs more cleanup.
2015-09-15MAINT-5601 Physics model not previewed, physics model not applied to mesh on ↵AndreyL ProductEngine
upload Some improvements: renaming to act like "legacy matching" would apply only to the models simple enough for this
2015-09-11MAINT-5601 FIXED Physics model not previewed, physics model not applied to ↵AndreyL ProductEngine
mesh on upload
2015-09-07MAINT-5602 FIXED Viewer crashes when loading physics from fileAndreyL ProductEngine
--HG-- branch : develop
2015-08-26MAINT-5532 related crash fix and some log improvementsandreykproductengine
2015-08-25MergeRider Linden
2015-08-27build fixMnikolenko ProductEngine