Commit Graph

94 Commits (7c42711ca3a4e67b95473aa5129dce5ff19bea15)

Author SHA1 Message Date
Ansariel c0fad3028f Re-enable compiler warnings C4018, C4100, C4231 and C4506 2024-06-10 16:42:43 +02:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
Ansariel c3e6f7b164 Convert remaining cases of BOOL to bool in llmath and llprimitive
Changed the return values for LLPrimitive::packTEMessage methods from FALSE to true - these seemed to be strange and wrong, especially considering the following statement in LLVOAvatarSelf:
bool success = packTEMessage(mesgsys);
2024-02-20 02:14:01 +02:00
Andrey Kleshchev e5ef481cd3 SL-20781 Follow up on boost to std replacement 2024-01-09 00:19:39 +02:00
Rye Mutt f35127faa0 Fix failure to save the normalized translation data during collada upload 2023-11-21 15:01:31 +02:00
Brad Linden eb526fec0a Merge remote-tracking branch 'origin/main' into DRTVWR-559 2022-12-12 17:59:34 -08:00
Dave Parks 75de4d3276 SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes. 2022-09-23 12:53:24 -05:00
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Dave Parks e49d602bd9 SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents in the mesh's original coordinate frame. 2022-09-12 19:48:33 -05:00
Brad Kittenbrink 38208441db Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-08-04 10:59:26 -07:00
Andrey Lihatskiy dfc1175546 Merge branch 'master' into DRTVWR-565-maint-P 2022-08-04 00:12:26 +03:00
Andrey Kleshchev 70009d21b2 SL-17890 Face creation does not clean used arrays 2022-08-03 01:46:01 +03:00
Andrey Kleshchev b08340f183 SL-17475 Remap models before simplification 2022-06-11 10:23:46 +03:00
Dave Houlton adaaccd3d7 SL-17214 additional glTF validation, remove dead code from DAE loader 2022-06-08 13:33:59 -06:00
Dave Houlton 8c0163bcb4 SL-17214 initial loader class skeleton 2022-06-08 13:33:59 -06:00
Andrey Kleshchev 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
Andrey Kleshchev 27e4e245d9 Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
Andrey Kleshchev 3641541c6c SL-15756 Removed mHasGeneratedFaces
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-11-15 23:23:09 +02:00
Dave Parks f79890669d SL-16006 and SL-16009 Rigged mesh rendering optimization pass 2021-09-20 18:58:09 +00:00
Andrey Kleshchev ca629c362c SL-15965 Support wider range of parsing errors 2021-09-09 21:17:00 +03:00
Andrey Kleshchev 1a17932440 DRTVWR-542 Automated method selection
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04 21:14:00 +03:00
Andrey Kleshchev 7235d333ea DRTVWR-542 Fix incorect dropbox state 2021-08-04 00:15:49 +03:00
Andrey Kleshchev 2d2ed85c56 DRTVWR-542 Fix malfunctioning warning 2021-07-28 22:19:43 +03:00
Andrey Kleshchev d0ac1505a7 SL-15102 Crash at load_face_from_dom_triangles 2021-04-13 00:40:00 +03:00
Andrey Lihatskiy 14bf268fbb Merge branch 'master' into DRTVWR-513-maint 2020-10-14 21:59:52 +03:00
Andrey Kleshchev bdedfb3755 SL-13566 'Use Joint Positions' Option causes collapsed Joints for some files 2020-08-28 21:01:48 +03:00
Andrey Kleshchev 3239f3518b SL-13698 Mac build fix 2020-08-11 20:43:50 +03:00
Mnikolenko Productengine 7a9a114e16 SL-13698 FIXED crash on model upload 2020-08-03 19:14:09 +03:00
Andrey Kleshchev da0024efec SL-13426 Fixed crash at processDomModel 2020-07-06 16:48:59 +03:00
Andrey Kleshchev 9221c8a3f6 SL-13080 Changes for joint listings in mesh uploader 2020-04-23 20:51:06 +03:00
Graham Linden 76128c4357 SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
Brad Payne (Vir Linden) 3f9b3e01b9 MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values. 2018-02-21 22:02:34 +00:00
andreykproductengine c8c8005e2f MAINT-2161 Fixed dae parsing issue - dae expects escaped names 2017-10-31 16:41:39 +02:00
andreykproductengine 5ddac01ef2 MAINT-7058 Fixed missing extents for generated (split) faces 2017-04-14 17:13:57 +03:00
andreykproductengine 4fc012fbfa Reverted changeset 409b67af8faf (MAINT-6901) 2016-12-23 15:16:50 +02:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
andreykproductengine 4ae6f32ee1 MAINT-6901 Fixes upload assigning different scale to parts of the model 2016-11-15 20:16:01 +02:00
Brad Payne (Vir Linden) a2fd408c9b MAINT-6853 - fix for viewer crash when checking preview skin weights 2016-10-21 09:50:13 -04:00
Mnikolenko Productengine 5d1f6223eb MAINT-6835 Material of model is not a subset of reference, cause upload model dialog to stick with error 2016-10-20 16:15:36 +03: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
andreykproductengine c4e9fe9fe5 MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name 2016-08-25 15:40:33 +03:00
Brad Payne (Vir Linden) 57da9bcd1b merge from viewer-release 2016-08-15 09:52:06 -04:00
Brad Payne (Vir Linden) d2302886bc MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now. 2016-06-15 15:24:54 -04:00
andreykproductengine 5048402da8 MAINT-5786 FIXED Redundant sibling index suffix on uploaded mesh object names. 2016-05-12 17:46:20 +03:00
Brad Payne (Vir Linden) 0447fe5a57 SL-371 - increased the limit for StackWalker strings, avoid crashing if mesh has wrong number of mAlternateBindMatrix matrices 2016-04-20 13:18:56 -04:00