From f4db2813e46bafb99993ff3912d6af7e7b875668 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 15 Dec 2021 22:57:36 +0000 Subject: [PATCH] change IsViewerCachable conditions a bit --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 472bb43b60..7abd48767d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -191,12 +191,11 @@ namespace OpenSim.Region.Framework.Scenes get { // needs more exclusion ? - return(Backup && !IsTemporary && !inTransit && !IsSelected && !UsesPhysics && !IsAttachmentCheckFull() && + return(Backup && !IsTemporary && !inTransit && !UsesPhysics && !IsAttachmentCheckFull() && !RootPart.Shape.MeshFlagEntry && // animations are not sent correctly for now RootPart.KeyframeMotion == null && - (DateTime.UtcNow.Ticks - timeLastChanged > 36000000000) && //36000000000 is one hour - RootPart.Velocity.LengthSquared() < 1e8f && // should not be needed - RootPart.Acceleration.LengthSquared() < 1e4f // should not be needed + (DateTime.UtcNow.Ticks - timeLastChanged > 3000000000) //&& //3000000000 is 5min + //(DateTime.UtcNow.Ticks - timeLastChanged > 36000000000) //&& //36000000000 is one hour ); } } @@ -669,9 +668,11 @@ namespace OpenSim.Region.Framework.Scenes } } - bool triggerScriptEvent = m_rootPart.GroupPosition != val; + bool triggerScriptEvent; if (m_dupeInProgress || IsDeleted) triggerScriptEvent = false; + else + triggerScriptEvent = m_rootPart.GroupPosition != val; m_rootPart.GroupPosition = val;