From ffd5c5cc9c0d7c9bb4311caf1745a8b51e8a7d24 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 10 Aug 2019 13:58:11 +0100
Subject: mantis 8573 and 8569: be more aggressive on drag block with touch on
non physical prims
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index dcfe79b..199aa92 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2097,8 +2097,7 @@ namespace OpenSim.Region.Framework.Scenes
{
SceneObjectPart part = GetPart(localId);
- if (((part.ScriptEvents & scriptEvents.anytouch) != 0) ||
- (part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0))
+ if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)
lastTouchTime = Util.GetTimeStampMS();
OnGrabPart(part, offsetPos, remoteClient);
}
@@ -3673,8 +3672,7 @@ namespace OpenSim.Region.Framework.Scenes
}
// a touch or pass may had become active ??
- if (((part.ScriptEvents & scriptEvents.anytouch) != 0) ||
- (part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0))
+ if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)
{
lastTouchTime = now;
return;
--
cgit v1.1