summaryrefslogtreecommitdiff
path: root/indra/newview/llmodelpreview.cpp
AgeCommit message (Collapse)Author
2025-10-25Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.08Erik Kundiman
2025-10-10Merge pull request #4783 from RyeMutt/rye/convexdecompJonathan "Geenz" Goodman
Introduce initial VHACD based llconvexdecomposition library
2025-10-03Initial VHACD based llconvexdecompositionRye
2025-09-24#4515 Improve ordering of sub-meshes upon uploadAndrey Kleshchev
2025-09-09Merge branch 'main' into 2025.06Erik Kundiman
2025-09-09Performance Optimisations, Bloom effect, Visuals Panelmobserveur
This commit contains performance optimisations in the the pipeline, framebuffer, vertexbuffer, reflection probes, shadows. It also fixes many opengl errors, modifies the opengl debugging, and adds a visuals effects panel.
2025-08-08Merge branch '2025.05' into 2025.06Erik Kundiman
2025-08-06Merge branch develop into 2025.06Andrey Kleshchev
# Conflicts: # indra/newview/llvoavatar.cpp
2025-07-29Merge tag 'Second_Life_Release#288bce10-2025.05' into 2025.05Erik Kundiman
2025-07-25#4415 fix crash when cancelling large model process on MacOSMaxim Nikolenko
2025-07-22#4318 Warn or log when texture gets scaled downAndrey Kleshchev
for material and model upload
2025-07-18Merge tag 'Second_Life_Release#f5d350fb-2025.05-gltf-mesh-import' into 2025.05Erik Kundiman
2025-07-08#4290 Unresponsive viewer when uploading modelsAndrey Kleshchev
Fix severe log spam
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-07-03#4322 Upload Model button is sometimes disabledAndrey Kleshchev
when it should not
2025-07-03#4242 Debug dump improvementAndrey Kleshchev
for better comparison with collada output
2025-06-28Revert "Fix LLCharacter base class constness." and restore improvements from ↵Ansariel
10a324a1034c177b95545ac7ffaa6aa6abed65ff instead
2025-06-24Merge tag 'Second_Life_Project#1a6e3286-GLTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-06-13#4147 Joint Overrides #3Andrey Kleshchev
Remande skeleton translation from default skeleton to overriden skeleton
2025-06-12#4147 Joint Overrides #2Andrey Kleshchev
2025-06-09#4148 Skeleton TranslationAndrey Kleshchev
2025-05-30Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into ↵Erik Kundiman
gltf-mesh-import
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# 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-22Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' ↵Erik Kundiman
into 2025.04
2025-05-21#4105 Support .gltf and .glb files in lookupLODModelFilesAndrey Lihatskiy
2025-05-16Merge branch 'release/2025.04' into geenz/gltf-mesh-importJonathan "Geenz" Goodman
2025-05-10#4056 Crash at childGetSelectionInterfaceAndrey Kleshchev
in model importer
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-10Convert BOOL to boolAnsariel
# Conflicts: # indra/newview/llagent.cpp
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# 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-08GLTF WIP. Still working on getting transforms working proper and need to ↵Jonathan "Geenz" Goodman
figure out our indices.
2025-04-01#912 Refactor FindModel()Andrey Lihatskiy
2025-04-01secondlife/viewer#912 BugSplat Crash 1412267 (missed refactoring for FindModel)Alexander Gavriliuk
# Conflicts: # indra/newview/llmodelpreview.cpp
2024-12-01Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-11-29#3133 add handler to prevent crash when preview gets closed before getting ↵Maxim Nikolenko
the callback
2024-11-26Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-11-22viewer#3133 Callback related crash in LLViewerFetchedTextureAndrey Kleshchev
Seems to be realted to LLModelPreview and path generated textures so I'm improving cleanup.
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-04cherry pick secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00 ↵Brad Linden
(#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-09-12Replace glh_linear usage with GLM (#2554)Rye Mutt
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-08Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h ↵Ansariel
and llunittype.h for now
2024-07-03viewer-private#247 Porperly reload image when uploading a modelAndrey Kleshchev
2024-06-20viewer-private#247 Retry loading missing textures for model uploadAndrey Kleshchev
in case user provided a texture later, after seeing a 'missing texture' error.
2024-06-20Merge remote-tracking branch 'secondlife/release/maint-b' into maint-bErik Kundiman
2024-06-10Re-enable compiler warnings C4018, C4100, C4231 and C4506Ansariel