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
b1f05340f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:41:58 +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
6efde0ba83
Merge pull request #4809 from secondlife/andreyk/viewer_4777
...
#4777 Fix crash on missing factory
2025-10-10 17:16:47 -04:00
14ae64f297
Restore allowing creating folder from selected on recent and favorites inventory panels
2025-10-11 03:43:20 +10:00
0f7a40f0a0
FIRE-36006 Russian translation update, by Romka Swallowtail
2025-10-10 14:56:10 +02:00
9d1f00968e
Revert "Make snapshot guides more visible"
...
This reverts commit c1c6f1ed5e
2025-10-10 08:59:40 +02:00
9267076ebb
Make the visibility/opacity of the composition guides in snapshot view configurable via debug setting, as per request
2025-10-10 08:19:01 +02:00
2ab023156b
[FIRE-35987] Slow texture loading (at least partial fix)
...
This fixes a specific issue that has existed for a while so it is not a full fix for FIRE-35987. It will however reduce overfetch and increased data/cache/RAM usage as a result of the overfetch.
2025-10-10 02:14:00 +01:00
c1c6f1ed5e
Make snapshot guides more visible
2025-10-09 23:47:19 +02:00
3445a01990
#4782 Improve wearing multiple items
2025-10-10 00:03:18 +03:00
400351f3b8
#4777 Fix crash on missing factory
2025-10-09 23:59:51 +03:00
f6c29b0356
FIRE-35342 Show capture frame shader on screen, when relevant option is selected in snapshot floater
...
Still no idea why guides are not working, but adding a missing setting for them, at least
2025-10-09 22:24:54 +02:00
f7680d408d
FIRE-35990: RLVa vision spheres needs to be visible in snaphsots and inworld if "snaphsot frame" is checked
...
Seems to work nicely with FSRenderVignette, too - no shaders conflict there
2025-10-09 21:16:52 +02:00
7e84883026
FIRE-36002 Update Japanese translation, by Logue Takacs
2025-10-09 20:42:28 +02:00
6e2a86f6b9
#4772 fix group ownership detection for deeded objects (FS:TJ- Fixes issue FIRE-35983)
2025-10-10 04:27:49 +10:00
f0d5e27b39
Update German translation
2025-10-09 19:28:29 +02:00
c15ba8799d
#4806 Crash at getPrimaryFormat
...
According to bugsplat tex is null
2025-10-09 19:39:11 +03:00
821adc997d
#4794 SceneLoadRearMaxRadiusFraction not stored as a fraction - <FS:minerjr> Cherry-pick to fix issue FIRE-36003
...
Reported issue to LL GitHub and FS JIRA FIRE-36003
LL Issue: https://github.com/secondlife/viewer/issues/4794
Linked to FS issue and cherry picked to pull in fix.
Inital Issue:
When you look at the SceneLoadRearMaxRadiusFraction value stored in the settings.xml, you will notice that the value is set to 75.0 for a float value. And the comments mention it is suppose to be fraction.
The code that uses it is for scaling the amount of the scene behind the visible camera is loaded. The issue is because the calculation no longer is divided by 100.0f, the draw distance is multiplied by the value and then clamped at the draw distance value. So it is effectively only ever the draw distance and not the default 75% of it. So a 256 draw distance is locked at 256 meters instead of 192.
This causes more objects to load behind the user, especially very far objects which can cause more RAM and VRAM usage, especially on teleport.
2025-10-09 12:19:30 -03:00
c257304ae7
#4803 Fix crash on cameraUnderWater
...
updateEnvironment tried to access dead camera
2025-10-09 01:04:34 +03:00
6fc138dc44
p#351 Mark RenderMaxOpenGLVersion as Windows specific
2025-10-08 22:29:16 +03:00
d76d0c239c
#4796 Preferences' mic volume slider had no effect.
2025-10-08 17:33:48 +03:00
1e254bb4c7
Add an option to disable reset buttons in camera floaters
2025-10-08 14:50:11 +02:00
69d7c0f7ef
secondlife/viewer#2570 : Fix baked texture shared between avatars when in PBR material
2025-10-07 20:02:49 +03:00
eb9cb1ab8c
#4794 SceneLoadRearMaxRadiusFraction not stored as a fraction
2025-10-07 17:46:46 +03:00
688224a6cb
#4772 fix group ownership detection for deeded objects
2025-10-07 17:25:50 +03:00
56cb655fbe
#4773 Crash on sub_image_lines (FS:TJ- Follow-up cherry-pick to fix out of bounds discard_levels)
...
Just caught it and discard_level is somehow 7, which seems like it resulted in src going out of bounds, which crashed glTexSubImage2D
2025-10-07 19:50:37 +10:00
d9db7bb645
p#480 Collada vs GLTF Mesh Import Naming Convention
...
Both collada and gltf have a node and a mesh. Collada uses node-name, gltf was using mesh-name.
GLTF format permits reusing single mesh for multiple nodes, but nodes are warrantied to not be reused.
Switch to using node-names for better dupplicate avoidance and to be more in line with collada.
2025-10-06 18:32:19 +03:00
9c28607a7c
#4195 Clear code from a merge conflict
...
This part was removed unintentionally, due to a merge conflict resolution.
2025-10-06 17:09:01 +03:00
5fe152cfea
Fix #4195 : Preserve transforms when switching PBR materials ( #4725 )
...
Fixes texture transforms being reset when switching from Blinn-Phong to PBR materials and between PBR. Previously, custom scale, offset, and rotation settings would be lost, making it tedious to switch between PBR materials.
2025-10-06 16:52:33 +03:00
f686fb54e5
mFSAreaSearchActive not initialized in llagent.cpp
...
The bool mFSAreaSearchActive was not initialized in the constructor and is undefined so it may or may not be false.
This flag is used for the search feature and is used for setting a region flag to send all objects and not just ones in front of the camera.
2025-10-06 05:29:18 -03:00
6f5d67fd1f
FIRE-35947 Hide the new 'options' and 'trash' icons at the top of outfits window
...
Currently they do not work, at all - Firestorm uses context menus and icons at the bottom of the panel anyway
Change can be reverted when they get some proper usage, right now they're a bit misleading
2025-10-04 19:11:31 +02:00
2ee66d2b6f
FIRE-35770 Sounds added to the blacklist keep playing
...
Partially reverts commit 9798fae3d2
2025-10-04 18:41:21 +02:00
a54a96a1f4
#1759 Fix texture picker using IMG_WHITE for blank materials
2025-10-04 18:57:13 +03:00
f846861f04
#4777 Fix webrtc crashing in worker threads on shutdown
2025-10-03 19:07:00 +03:00
b277cc6a8f
Initial VHACD based llconvexdecomposition
2025-10-03 09:51:03 -04:00
052d49786a
FIRE-35986: Restore using subfolders for asset cache
2025-10-03 15:49:56 +02:00
9a413357ad
Fix infinite growth of mLoadingPhysicsShapes in mesh repository
2025-10-03 08:55:10 -04:00
99d8f22c99
#4757 Model uploader warning when physics library is missing
2025-10-02 22:54:44 +03:00
4b5d1c660c
Add workflow_dispatch trigger to build workflow ( #4774 )
...
Allow builds to be manually triggered
2025-10-02 12:42:02 -07:00
45528d3328
#4773 Crash on sub_image_lines
...
Just caught it and discard_level is somehow 7, which seems like it resulted in src going out of bounds, which crashed glTexSubImage2D
2025-10-01 21:59:22 +03:00
f05fe9c195
#4770 Crashes on ~LLCoprocedureManager()
...
Situation is not clear, so hoping that explicit
cleanup will reveal something.
2025-10-01 21:59:22 +03:00
4098a28082
Merge remote-tracking branch 'origin/master' into FIRE-35794
2025-10-01 17:42:39 +01:00
21ec3ed509
'this' can't be null so gcc rejects it
2025-10-01 17:42:24 +01:00
77bdbf965f
Take median over longer period to avoid out-of-bounds warning on gcc
...
Not sure why this only complained today.
2025-10-01 17:41:29 +01:00
a12e38911e
Use llmin instead of llmax to correctly clamp mMaxDiscardLevel
2025-10-02 02:26:29 +10:00
69312e248e
#4768 Crash at retransmitUnackedPackets
...
For some reason there are no logs for these crashes, but lack of
connection data indicates that viewer was disconnected prior to crash.
2025-10-01 18:48:38 +03:00
49caa5e179
#4758 Extra logging to track discard 6
...
Plus clamped some values and preventing decode from starting
# Conflicts:
# indra/newview/llviewertexture.cpp
2025-10-02 01:33:20 +10:00
b8bc108ea7
Partial restore of texture pipeline changes to address texture discard issues
2025-10-02 01:23:36 +10:00
503affdc97
#vp484 Crash in LLFolderViewFolder::setOpen
2025-10-01 17:54:46 +03:00
Ansariel