diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 2995091..b0ecb80 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
341 | if(group == null || group.IsDeleted) | 341 | if(group == null || group.IsDeleted) |
342 | return; | 342 | return; |
343 | 343 | ||
344 | if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.) | 344 | if (Permissions.CanMoveObject(group, remoteClient)) |
345 | { | 345 | { |
346 | group.GrabMovement(objectID, offset, pos, remoteClient); | 346 | group.GrabMovement(objectID, offset, pos, remoteClient); |
347 | } | 347 | } |
@@ -359,16 +359,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
359 | Vector3 grabOffset = pos - part.AbsolutePosition; | 359 | Vector3 grabOffset = pos - part.AbsolutePosition; |
360 | // If the touched prim handles touches, deliver it | 360 | // If the touched prim handles touches, deliver it |
361 | if ((part.ScriptEvents & scriptEvents.touch) != 0) | 361 | if ((part.ScriptEvents & scriptEvents.touch) != 0) |
362 | // EventManager.TriggerObjectGrabbing(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); | ||
363 | EventManager.TriggerObjectGrabbing(part.LocalId, 0, grabOffset, remoteClient, surfaceArg); | 362 | EventManager.TriggerObjectGrabbing(part.LocalId, 0, grabOffset, remoteClient, surfaceArg); |
363 | |||
364 | // Deliver to the root prim if the touched prim doesn't handle touches | 364 | // Deliver to the root prim if the touched prim doesn't handle touches |
365 | // or if we're meant to pass on touches anyway. | 365 | // or if we're meant to pass on touches anyway. |
366 | if (((part.ScriptEvents & scriptEvents.touch) == 0) || | 366 | if (((part.ScriptEvents & scriptEvents.touch) == 0) || |
367 | (part.PassTouches && (part.LocalId != group.RootPart.LocalId))) | 367 | (part.PassTouches && (part.LocalId != group.RootPart.LocalId))) |
368 | { | ||
369 | // EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); | ||
370 | EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, grabOffset, remoteClient, surfaceArg); | 368 | EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, grabOffset, remoteClient, surfaceArg); |
371 | } | ||
372 | } | 369 | } |
373 | 370 | ||
374 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) | 371 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) |