Commit Graph

18 Commits (a52391d582ec7299273d3ff38efdb2455da7700e)

Author SHA1 Message Date
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
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
andreykproductengine 1840868178 SL-304 [Mesh Uploader] Localization support for logs, better warnings for joints 2019-11-27 20:34:26 +02:00
andreykproductengine 580b35c8ea SL-307 Display in-viewer all warning messages logged by the mesh uploader 2019-04-01 20:22:25 +03:00
Brad Payne (Vir Linden) 791979c553 SL-928 - in mesh upload, warn if bind shape is non-identity and skin weights are enabled. 2018-08-08 13:34:02 +01:00
Brad Payne (Vir Linden) 72d5ff36f5 MAINT-6647 - ignore previously created slm files on model upload. SL-442 - change coloring for show bones, to highlight joint positions and rigging 2016-08-17 16:31:28 -04:00
Brad Payne (Vir Linden) 299c04fa42 SL-319 - removed specific joint requirements for skinned mesh and joint offset uploads. 2016-01-20 10:52:37 -05:00
Brad Payne (Vir Linden) a6c8de97bb SL-302 WIP - handle the case that node name is NULL 2016-01-15 11:29:34 -05:00
Aura Linden 99219cbe80 Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml. 2015-11-13 04:12:13 -08:00
Aura Linden 146919fa76 animations and meshes will recognize all joint names in joint_aliases.xml 2015-11-11 13:44:51 -08:00
Brad Payne (Vir Linden) be11d020ca SL-266 WIP - removed obsolete rigParityWithScene code, set legacy and joint offset upload based on AND-ing state of all meshes in file. 2015-11-09 14:57:00 -05:00
Brad Payne (Vir Linden) ded9b10d5d SL-114 WIP - constrain uploaded meshes based on max joints per mesh. Set max joints per mesh to 110. Also fixed some uninitialized members of LLModelLoader. 2015-10-29 16:09:22 -04:00
Brad Payne (Vir Linden) ebad0c6868 DRTVWR-412 WIP - more work for importer merge from viewer-release 2015-10-01 11:05:29 -04:00
andreykproductengine 6993f835e7 MAINT-4915 FIXED [loader mods] Incorrect error description in case of VERTEX_NUMBER_OVERFLOW 2015-02-23 15:04:32 +02:00
Graham Linden a815ad481a Mergeup to 3.7.9 viewer-release 2014-05-29 04:54:58 -07:00
Graham Linden 99952dc358 More missing bits 2014-04-22 19:08:29 -07:00