e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
2cdcd336ba
Merge pull request #4783 from RyeMutt/rye/convexdecomp
...
Introduce initial VHACD based llconvexdecomposition library
2025-10-10 17:17:25 -04:00
9a413357ad
Fix infinite growth of mLoadingPhysicsShapes in mesh repository
2025-10-03 08:55:10 -04:00
2756f190b4
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2025-09-27 11:39:25 +02:00
351b7763a8
#4515 Improve ordering of sub-meshes upon upload
2025-09-24 22:12:47 +03:00
4b8049e22b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-03 19:44:45 +02:00
d1e185921d
#4621 Crash at LLMeshRepoThread::run(1060)
...
Fix a missed mutex
2025-09-02 19:39:09 +02:00
e5b7e8a9a8
#4621 Crash at LLMeshRepoThread::run(1060)
...
Fix a missed mutex
2025-09-02 19:31:33 +03:00
0573e31002
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2025-08-31 12:07:48 +02:00
0fc42e951f
#4608 Crash at LLJoint::findJoint
...
'this' is null inside findJoint according to bugsplat so likely mRoot
was not initialized yet.
2025-08-27 16:09:14 +03:00
8d220e4973
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
434f9e9271
#4544 Make model dump go into logs
...
not into work folder, viewer isn't supposed to write there.
2025-08-19 00:05:14 +03:00
37a04baf10
#4544 Add source format information to mesh upload statistics
2025-08-15 00:16:46 +03:00
539959a7f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
2025-08-06 18:47:44 +02:00
c43b544dc6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202505
2025-08-06 18:26:27 +02:00
ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
acc8928330
Merge release/2025.05 into develop
2025-08-06 14:17:18 +03:00
a4e8af0dce
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# CONTRIBUTING.md
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/res/viewerRes.rc
# indra/newview/skins/default/xui/de/panel_login_first.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_login_first.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/en/panel_status_bar.xml
# indra/newview/skins/default/xui/es/panel_login_first.xml
# indra/newview/skins/default/xui/fr/panel_login_first.xml
# indra/newview/skins/default/xui/it/panel_login_first.xml
# indra/newview/skins/default/xui/ja/panel_login_first.xml
# indra/newview/skins/default/xui/pl/panel_login_first.xml
# indra/newview/skins/default/xui/pt/panel_login_first.xml
# indra/newview/skins/default/xui/ru/panel_login_first.xml
# indra/newview/skins/default/xui/tr/panel_login_first.xml
# indra/newview/skins/default/xui/zh/panel_login_first.xml
# indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02:00
08971cd9ac
Fix a crash bug and bogus calculations in LLMeshRepoThread::lodReceived() ( #4398 , #4408 )
...
When trying to update the rigging info for a newly received mesh LOD,
a wrong usage of LLVolume::getNumFaces() is done to get the number of
volume faces, causing the code to iterate over the number of faces in
the underlying LLProfile instead. LLVolume::getNumVolumeFaces() must
be used here.
This fixes a crash bug seen with low LODs in some meshes (when the number
of mesh faces is smaller than the number of faces in the LLProfile), and
also properly updates the rigging info for all mesh faces, as it should,
when the mesh got more faces than the LLProfile.
2025-07-22 19:22:55 +03:00
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
5a50be4e15
#4294 Make upload order more deterministic #2
2025-07-14 19:48:52 +03:00
07d0fbe94e
#4294 Make upload order more deterministic
...
to make root prim more deterministic instead of being random each try
2025-07-12 02:22:02 +03:00
19ffeb6e2d
#4357 Crash in LLMeshRepoThread::lodReceived
2025-07-09 23:16:17 +03:00
5a0bbdc510
#4242 Debug dump improvement
...
for better comparison with collada output
2025-07-03 00:32:58 +03:00
7b770b1786
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-29 12:34:42 +02:00
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
6cb5a7425f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llskinningutil.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-23 12:22:21 +02:00
0360d8529a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
2025-05-23 12:00:16 +02:00
0e11e70852
Fix for previous commit
2025-05-20 18:47:54 +02:00
ca7b4058e7
Fix mesh res enabled check
2025-05-20 18:33:14 +02:00
fdf75d8854
FIRE-35602 - revisit for OpenSim
...
reinstate the prio behaviour only on opensim where it might still be plausible to get the meshRezEnabled false back from the region. Retain a bias to True.
SL behaviour remains the same as the LL fix
2025-05-19 19:53:44 +01:00
a7ba94d507
#4081 Meshes missing after teleport
2025-05-18 22:07:36 +01:00
469795979f
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/colors.xml
2025-05-14 21:56:38 +02:00
05557554c3
#4081 Meshes missing after teleport
2025-05-14 21:28:30 +03:00
cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
9d6c74a051
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-04-25 22:21:12 +02:00
b30283e5ef
#3960 Fix expensive mesh thread score calculations
2025-04-22 22:21:29 +03:00
af9254e3e3
#3870 Added joint initialization for LLVOAvatarSelf
...
Sometimes mesh thread crashes when allocating joints
2025-04-22 12:17:54 +02:00
9b531e01eb
#3488 Reduce locking
...
1. 'sActive' variables are atomic, no locks needed
2. Fix trylocks. There are internal locks inside loadMeshLOD so without
checking locks 3 and 4 viewer would be locked on each loadMeshLOD,
potentially making main thread wait for threads to unlock.
2025-04-22 12:06:49 +02:00
87b6428f55
#3870 Added joint initialization for LLVOAvatarSelf
...
Sometimes mesh thread crashes when allocating joints
2025-04-22 12:39:42 +03:00
44bbdc549a
#3488 Reduce locking
...
1. 'sActive' variables are atomic, no locks needed
2. Fix trylocks. There are internal locks inside loadMeshLOD so without
checking locks 3 and 4 viewer would be locked on each loadMeshLOD,
potentially making main thread wait for threads to unlock.
2025-04-22 12:39:42 +03:00
4c355879cc
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewitem.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatermodelpreview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitsinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llselectmgr.h
# indra/newview/llskinningutil.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerattachmenu.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerinventory.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_object_weights.xml
# indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_wearing_tab.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/en/panel_outfits_list.xml
# indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
# indra/newview/skins/default/xui/en/panel_places.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/en/sidepanel_appearance.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
2025-04-16 17:49:47 +02:00
ae93198735
Merge branch 'main' into marchcat/maint-c-restore
...
# Conflicts:
# indra/llcommon/lldate.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
2025-04-15 19:31:20 +03:00
03f622d0d4
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/skins/default/xui/en/strings.xml
2025-04-13 17:47:57 +02:00
1c90421b88
#3596 Faster mesh thread shutdown
2025-04-11 12:36:48 +03:00
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
62e5fffd8e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/lldrawpooltree.cpp
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/colors.xml
2025-03-23 12:29:33 +01:00
b6bf32e00e
#3488 Prelock mutexes
...
Main thread has priority, it shouldn't be relocking on each loadMeshLOD
2025-03-19 19:13:20 +02:00
d19e6abc5e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
2025-03-01 01:09:19 +01:00
100861aec1
#3596 Fix use of dead references
...
1. Was posting a would-be-dead reference to a thread
2. loadMeshLODs was getting dead references. It's no longer relevant so
just restored logic to wotk like it was before loadMeshLODs
2025-02-23 11:38:18 +02:00
Ansariel