Jonathan "Geenz" Goodman
|
2cdcd336ba
|
Merge pull request #4783 from RyeMutt/rye/convexdecomp
Introduce initial VHACD based llconvexdecomposition library
|
2025-10-10 17:17:25 -04:00 |
|
Rye
|
b277cc6a8f
|
Initial VHACD based llconvexdecomposition
|
2025-10-03 09:51:03 -04:00 |
|
Andrey Kleshchev
|
351b7763a8
|
#4515 Improve ordering of sub-meshes upon upload
|
2025-09-24 22:12:47 +03:00 |
|
Andrey Kleshchev
|
ce9d66cdd1
|
Merge branch develop into 2025.06
# Conflicts:
# indra/newview/llvoavatar.cpp
|
2025-08-06 16:05:19 +03:00 |
|
Maxim Nikolenko
|
5c746ae372
|
#4415 fix crash when cancelling large model process on MacOS
|
2025-07-25 01:44:36 +03:00 |
|
Andrey Kleshchev
|
d84897967e
|
#4318 Warn or log when texture gets scaled down
for material and model upload
|
2025-07-22 19:16:26 +03:00 |
|
Andrey Kleshchev
|
b7dbe0e49e
|
#4290 Unresponsive viewer when uploading models
Fix severe log spam
|
2025-07-08 00:52:35 +03:00 |
|
Andrey Kleshchev
|
10b787e3e6
|
#4322 Upload Model button is sometimes disabled
when it should not
|
2025-07-03 00:32:58 +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 |
|
Andrey Kleshchev
|
54660c8931
|
#4147 Joint Overrides #3
Remande skeleton translation from default skeleton to overriden skeleton
|
2025-06-13 21:49:02 +03:00 |
|
Andrey Kleshchev
|
8322a9a61e
|
#4147 Joint Overrides #2
|
2025-06-12 15:55:47 +03:00 |
|
Andrey Kleshchev
|
b20d10c0cc
|
#4148 Skeleton Translation
|
2025-06-09 20:06:01 +03:00 |
|
Andrey Lihatskiy
|
b08ba3fa7b
|
Merge branch 'main' into marchcat/2505-merge
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/llui/llflatlistview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
|
2025-05-28 21:38:00 +03:00 |
|
Andrey Lihatskiy
|
a58adfff8f
|
#4105 Support .gltf and .glb files in lookupLODModelFiles
|
2025-05-21 08:36:03 +03:00 |
|
Jonathan "Geenz" Goodman
|
bb76eae4b8
|
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
|
2025-05-16 19:05:57 -04:00 |
|
Andrey Kleshchev
|
872fd15caf
|
#4056 Crash at childGetSelectionInterface
in model importer
|
2025-05-10 11:25:56 +03:00 |
|
Ansariel
|
a510a1da00
|
Convert BOOL to bool
# Conflicts:
# indra/newview/llagent.cpp
|
2025-04-10 23:54:36 +03:00 |
|
Andrey Lihatskiy
|
5d7a5001b4
|
Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
|
2025-04-10 06:01:50 +03:00 |
|
Jonathan "Geenz" Goodman
|
c8499b7f01
|
GLTF WIP. Still working on getting transforms working proper and need to figure out our indices.
|
2025-04-08 13:51:21 -04:00 |
|
Andrey Lihatskiy
|
497c309a5b
|
#912 Refactor FindModel()
|
2025-04-01 15:24:15 +03:00 |
|
Alexander Gavriliuk
|
c609a45c26
|
secondlife/viewer#912 BugSplat Crash 1412267 (missed refactoring for FindModel)
# Conflicts:
# indra/newview/llmodelpreview.cpp
|
2025-04-01 15:24:15 +03:00 |
|
Maxim Nikolenko
|
5ac2adfa28
|
#3133 add handler to prevent crash when preview gets closed before getting the callback
|
2024-11-29 00:16:20 +02:00 |
|
Andrey Kleshchev
|
bedf884caf
|
viewer#3133 Callback related crash in LLViewerFetchedTexture
Seems to be realted to LLModelPreview and path generated textures so I'm
improving cleanup.
|
2024-11-22 20:58:50 +02:00 |
|
Brad Linden
|
da341eb2da
|
cherry pick secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00 (#2785)
* secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00
* fix cherry-pick merge breakage.
* Fix signed/unsigned error
---------
Co-authored-by: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
|
2024-10-04 14:16:04 -07:00 |
|
Rye Mutt
|
b713f56d07
|
Replace glh_linear usage with GLM (#2554)
|
2024-09-12 11:22:10 -05:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Andrey Kleshchev
|
42a9690daa
|
viewer-private#247 Porperly reload image when uploading a model
|
2024-07-03 06:23:50 +03:00 |
|
Andrey Kleshchev
|
2515f422cf
|
viewer-private#247 Retry loading missing textures for model upload
in case user provided a texture later, after seeing a 'missing texture'
error.
|
2024-06-20 23:23:05 +03:00 |
|
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 Kleshchev
|
741b79d63b
|
viewer#1529 Mesh Uploader should permit lowering material count
|
2024-05-22 11:10:17 +03:00 |
|
Alexander Gavriliuk
|
a266a4356f
|
secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working as expected
|
2024-05-15 20:50:59 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03: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 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Andrey Lihatskiy
|
eab5beb54c
|
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
2024-04-12 15:43:34 +03:00 |
|
Ansariel
|
d0102af56d
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
|
2024-04-11 21:59:38 +02:00 |
|
Andrey Lihatskiy
|
84dfe55810
|
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 07:08:25 +03:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Andrey Kleshchev
|
e0c604c5f6
|
SL-17372 Fix viewer crashing when switching models
mDefaultPhysicsShapeP could reference a dead model if scene changes
|
2024-01-27 01:18:14 +02:00 |
|
Andrey Kleshchev
|
8ea1f4a3fc
|
SL-15628 Crash inside ~LLModelInstanceBase
More explicit cleanup in hopes of narrowing down which of the models
failed
|
2023-12-15 03:51:36 +02:00 |
|
Andrey Lihatskiy
|
0465c761a4
|
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
|
2023-11-30 12:28:26 +02:00 |
|
Alexander Gavriliuk
|
beb6181863
|
SL-19299 Code formatting in modified files
|
2023-08-23 20:43:49 +02:00 |
|
Alexander Gavriliuk
|
85efb85acf
|
SL-19299 Viewer crashes after change 'Pick a physics model:' dropdown
|
2023-08-23 18:16:43 +02:00 |
|
Brad Linden
|
ae63ed51aa
|
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
|
2023-07-18 14:38:18 -07:00 |
|
RunitaiLinden
|
8d17467f7f
|
SL-19884 Fix for garbled rigged meshes in model import preview window.
|
2023-06-27 18:49:36 -05:00 |