Skip to content

Fix vehicle unseating on region crossings by ignoring outgoing sim kills #6170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shadowolf7 wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −0
Open

Fix vehicle unseating on region crossings by ignoring outgoing sim kills #6170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3adda4
Fix vehicle unseating on region crossings by ignoring outgoing sim kills
Shadowolf7 Aug 21, 2026
e717f25
Avoid log spam on crossing vehicle kills and cache root pointer
Shadowolf7 Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions indra/newview/llviewermessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3677,6 +3677,22 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
LLViewerObject *objectp = gObjectList.findObject(id);
if (objectp)
{
// Block vehicle / seat kills sent by the outgoing simulator during region crossings
if ( regionp && (regionp != gAgent.getRegion()) &&
isAgentAvatarValid() && gAgentAvatarp->isSitting() )
{
LLViewerObject* rootp = objectp->getRootEdit();
if (rootp && (gAgentAvatarp->getRoot() == rootp))
{
if (objectp == rootp)
{
LL_INFOS("Avatar") << "Ignoring vehicle kill from outgoing region " << regionp->getName()
<< " for seated root object " << rootp->getID() << LL_ENDL;
}
continue;
}
}

// Display green bubble on kill
if ( gShowObjectUpdates )
{
Expand Down
Loading