livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,905 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

37 Commits (dc540f664d0773b3ad691a5f961ed878fb416f63)

Author SHA1 Message Date
Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 
# Conflicts:
#	.github/pull_request_template.md
#	indra/llappearance/lltexlayer.cpp
#	indra/llcommon/llthread.cpp
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lltoolpie.cpp
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
 2025-07-18 14:14:54 +02:00
Andrey Kleshchev 60425f69f7 #4314 Fix model suffixes 
Usecase: Unable to use the same GLB model for physics
 2025-07-08 23:13:19 +03:00
Andrey Kleshchev 5a0bbdc510 #4242 Debug dump improvement 
for better comparison with collada output
 2025-07-03 00:32:58 +03:00
Ansariel 75db5e8b6b Revert "Fix LLCharacter base class constness." and restore improvements from 10a324a103 instead 2025-06-28 19:31:02 +02:00
Ansariel fef4f9a07e Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llcharacter/llcharacter.cpp
#	indra/llcharacter/llcharacter.h
#	indra/llcharacter/lljoint.cpp
#	indra/llcharacter/lljoint.h
#	indra/llimage/llimagedimensionsinfo.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelprofilepicks.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
#	indra/newview/llwatchdog.cpp
#	indra/newview/llwatchdog.h
 2025-05-03 15:45:54 +02:00
Ansariel Hiller 10a324a103
Reduce cost of joint lookups by reducing string allocations via use of std::string_view and heterogeneous map lookups (#3970) 2025-04-25 20:52:38 +03:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
 2024-05-01 12:30:57 +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 45dc1a63f0 Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llprimitive/lldaeloader.cpp
#	indra/llui/lllayoutstack.cpp
#	indra/llui/llnotifications.h
#	indra/llui/lltoolbar.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llfloaterimnearbychathandler.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llsidepanelappearance.h
#	indra/newview/lltoolbarview.cpp
 2024-01-12 14:18:34 +01:00
Ansariel 645cca9765 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-10 10:52:46 +01:00
Beq 0f64c31fcd [FIRE-32599] Local Mesh - Add Support for broken collada (autodesk) 
reuses the same LLDAELoader function.
 2023-02-05 01:24:27 +00:00
Ansariel 8e4abf8ea3 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-06-10 13:52:52 +02: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
Beq 16b63a990e Allow user to configure LOD suffixes to suit their workflow. 2022-06-05 22:26:52 +01:00
Ansariel c5af669e3b Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer 2020-08-12 12:24:35 +02: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
Ansariel 4c9ca0ff2a Merge bento-box 2016-03-21 20:59:56 +01:00
Ansariel c13eec6cfe Merge Firestorm LGPL 2016-03-21 20:48:39 +01:00
Brad Payne (Vir Linden) 2afde26d93 merge 2016-03-21 11:00:22 -04:00
AndreyL ProductEngine 8920beabc4 MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed 2016-02-17 03:01:04 +02:00
Brad Payne (Vir Linden) 3612d7d14b merge 2016-01-15 16:42:39 -05:00
Ansariel be6ce75a96 Merge bento-box 2015-12-17 11:47:42 +01:00
AndreyL ProductEngine dca797c3db MAINT-5678 [Importer] materials with spaces in name import with truncated names 2015-12-08 02:52:15 +02:00
AndreyL ProductEngine a9fff9a868 Backed out changeset: de52f1d38f3c 2015-12-10 23:21:56 +02: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) 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
Aura Linden 97374a5362 Fixes SL-202 joint offset and skin weight import. Race condition still exists. 2015-10-27 15:15:34 -07:00
AndreyL ProductEngine ddaa0e1865 MAINT-5678 FIXED Materials with spaces in name import with truncated names 2015-10-12 19:35:08 +03: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
AndreyL ProductEngine cb30550a28 MAINT-5678 FIXED Materials with spaces in name import with truncated names 2015-10-12 19:35:08 +03:00
andreykproductengine 10e1bb6ea4 MAINT-5114 FIXED [Project-Importer] LOD files following new naming cannot be uploaded on their own. 2015-04-16 17:58:50 +03:00
andreykproductengine e712a5230e MAINT-4982 Naming rules unification 2015-03-27 21:22:18 +02:00
andreykproductengine 051052b141 MAINT-4983 Mesh upload of large model ryoma 3d loads indefinitely 2015-03-25 20:07:21 +02:00
Graham Linden 428f2aa84e Added missing new files 2014-04-22 13:57:56 -07:00