e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
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
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
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
21b5928652
SL-19097 Crash when selecting a model for upload and waiting too long
...
Should be fixed by SL-18996, but just in case user decides to select a model while viewer closes
2023-01-28 02:02:42 +02:00
8c0163bcb4
SL-17214 initial loader class skeleton
2022-06-08 13:33:59 -06:00
1840868178
SL-304 [Mesh Uploader] Localization support for logs, better warnings for joints
2019-11-27 20:34:26 +02:00
580b35c8ea
SL-307 Display in-viewer all warning messages logged by the mesh uploader
2019-04-01 20:22:25 +03:00
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
299c04fa42
SL-319 - removed specific joint requirements for skinned mesh and joint offset uploads.
2016-01-20 10:52:37 -05:00
99219cbe80
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
2015-11-13 04:12:13 -08:00
146919fa76
animations and meshes will recognize all joint names in joint_aliases.xml
2015-11-11 13:44:51 -08:00
b72480ddb9
SL-114 WIP - made mesh upload errors/warnings slightly more informative and less spammy.
2015-11-10 15:52:41 -05:00
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
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
ebad0c6868
DRTVWR-412 WIP - more work for importer merge from viewer-release
2015-10-01 11:05:29 -04:00
0faa19e03d
Linux build fix
2015-05-05 17:38:01 +03:00
401eed50de
MAINT-4882 FIXED Mesh complex model upload with .slm uses different default model name
2015-02-13 16:07:59 +02:00
5a455a53e6
MAINT-4813 FIXED "failed to upload: MAV_BLOCK_MISSING" appears when try to upload a large mesh
2015-02-10 19:48:45 +02:00
74cf2c804e
MAINT-4487 FIXED [loader mods] triangle limits from .slm are ignored when uploading the model the second time.
2014-10-22 12:11:50 +03:00
a815ad481a
Mergeup to 3.7.9 viewer-release
2014-05-29 04:54:58 -07:00
99952dc358
More missing bits
2014-04-22 19:08:29 -07:00
Ansariel