Skip to content

geenz/linux-to-develop to lua_editor - #6133

Merged
marchcat merged 208 commits into
project/lua_editorfrom
marchcat/lua-linux-develop
Aug 13, 2026
Merged

geenz/linux-to-develop to lua_editor#6133
marchcat merged 208 commits into
project/lua_editorfrom
marchcat/lua-linux-develop

Conversation

@marchcat

@marchcat marchcat commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

project/lua_editor <- geenz/linux-to-develop merge

maxim-productengine and others added 30 commits April 13, 2026 12:40
…5632)

The glTF importer branches on LLJointData::mSupport when it decides whether a collision volume should inherit the current rest matrix or the support-rest matrix. That value was never copied from the avatar skeleton XML into LLJointData, so the importer was effectively making that decision on uninitialized state.
The glTF importer rebuilt collision volume override-rest matrices from the imported translation override and viewer-side scale only. That dropped the collision volume rotation defined in avatar_skeleton.xml and produced incorrect inverse bind matrices for rotated collision volumes, especially the torso volumes that use non-uniform scale. The result was a visible mismatch between rigged mesh imported from .glb and the equivalent .dae upload.
…lay the type of connection the version is applicable to.
Bumps [BugSplat-Git/symbol-upload](https://github.com/bugsplat-git/symbol-upload) from 095d163ae9ceb006d286a731dcd35cf6a1b458c8 to 2a0d2b8cf9c54c494144048f25da863d93a02ccd.
- [Release notes](https://github.com/bugsplat-git/symbol-upload/releases)
- [Commits](BugSplat-Git/symbol-upload@095d163...2a0d2b8)

---
updated-dependencies:
- dependency-name: BugSplat-Git/symbol-upload
  dependency-version: 2a0d2b8cf9c54c494144048f25da863d93a02ccd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
#5634: Apply version string from janus server if available. Also display the type of connection the version is applicable to.
This fixes a bug where the user logs in with good cache, server issues use-cached response, and then the viewer would send another mutelist request on region change.

Signed-off-by: Darl <me@darl.cat>
Constitutes zero behavioral changes.

Signed-off-by: Darl <me@darl.cat>
Velopack's uninstall can't be canceled, so instead it now checks for presense of a running window, makes sure window matches velopack's path, then sends a shutdown message. Window gets the message, verifies path, initiates shutdown.
* #5690 fix viewer trying to fetch group chat history for p2p IM
* #5690 cache "FetchGroupChatHistory" setting
#5702: Ensure non-visible preloaded media has PRIORITY_HIDDEN
Might be better to throw a 'missing files' error here, but we normally continue in such cases, so I'm just logging the incident.
I'm not sure if viewer should actually be shutting down on this, but as
a minimum we should be updating or clearing marker files. If viewer
crashes because of a hibernation, it isn't our problem. Viewer isn't
built for that and we can't maintain 'heartbeats' in hibernation.
Geenz and others added 3 commits August 12, 2026 18:37
# Conflicts:
#	.github/workflows/build.yaml
#	indra/llinventory/llinventory.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@github-actions

Copy link
Copy Markdown


Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA


16 out of 17 committers have signed the CLA.
βœ… (maxim-productengine)[https://github.com/maxim-productengine]
βœ… (gaiaclary)[https://github.com/gaiaclary]
βœ… (cosmic-linden)[https://github.com/cosmic-linden]
βœ… (mayconbekkers)[https://github.com/mayconbekkers]
βœ… (akleshchev)[https://github.com/akleshchev]
βœ… (Hecklezz)[https://github.com/Hecklezz]
βœ… (DarlCat)[https://github.com/DarlCat]
βœ… (rohvani)[https://github.com/rohvani]
βœ… (trish-sl)[https://github.com/trish-sl]
βœ… (santoslgl01-web)[https://github.com/santoslgl01-web]
βœ… (marchcat)[https://github.com/marchcat]
βœ… (TommyTheTerrible)[https://github.com/TommyTheTerrible]
βœ… (Geenz)[https://github.com/Geenz]
βœ… (AndrewMeadows)[https://github.com/AndrewMeadows]
βœ… (callumlinden)[https://github.com/callumlinden]
βœ… (primgineer)[https://github.com/primgineer]
❌ @Copilot
You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.

@marchcat
marchcat merged commit 039c1b4 into project/lua_editor Aug 13, 2026
16 of 17 checks passed
@marchcat
marchcat deleted the marchcat/lua-linux-develop branch August 13, 2026 17:18
@github-actions github-actions Bot locked and limited conversation to collaborators Aug 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.