diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files 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 | |||
2097 | { | 2097 | { |
2098 | SceneObjectPart part = GetPart(localId); | 2098 | SceneObjectPart part = GetPart(localId); |
2099 | 2099 | ||
2100 | if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || | 2100 | if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0) |
2101 | (part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)) | ||
2102 | lastTouchTime = Util.GetTimeStampMS(); | 2101 | lastTouchTime = Util.GetTimeStampMS(); |
2103 | OnGrabPart(part, offsetPos, remoteClient); | 2102 | OnGrabPart(part, offsetPos, remoteClient); |
2104 | } | 2103 | } |
@@ -3673,8 +3672,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3673 | } | 3672 | } |
3674 | 3673 | ||
3675 | // a touch or pass may had become active ?? | 3674 | // a touch or pass may had become active ?? |
3676 | if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || | 3675 | if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0) |
3677 | (part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)) | ||
3678 | { | 3676 | { |
3679 | lastTouchTime = now; | 3677 | lastTouchTime = now; |
3680 | return; | 3678 | return; |