diff options
author | Robert Adams | 2017-10-13 12:04:52 -0700 |
---|---|---|
committer | Robert Adams | 2017-10-13 12:04:52 -0700 |
commit | b51b4d417131e7b49ff4c1bc708debd6d0c2d025 (patch) | |
tree | bd3530bcaf9ead5ff78b2af42d23c53ec445c5d4 /OpenSim/Region | |
parent | BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" to (diff) | |
parent | mantis 8249: give better data to llDetectedGrab (diff) | |
download | opensim-SC_OLD-b51b4d417131e7b49ff4c1bc708debd6d0c2d025.zip opensim-SC_OLD-b51b4d417131e7b49ff4c1bc708debd6d0c2d025.tar.gz opensim-SC_OLD-b51b4d417131e7b49ff4c1bc708debd6d0c2d025.tar.bz2 opensim-SC_OLD-b51b4d417131e7b49ff4c1bc708debd6d0c2d025.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beat
me to the repository).
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 4fef9c3..3fde5f1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -306,14 +306,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
306 | 306 | ||
307 | // If the touched prim handles touches, deliver it | 307 | // If the touched prim handles touches, deliver it |
308 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) | 308 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) |
309 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); | 309 | EventManager.TriggerObjectGrab(part.LocalId, 0, offsetPos, remoteClient, surfaceArg); |
310 | 310 | ||
311 | // Deliver to the root prim if the touched prim doesn't handle touches | 311 | // Deliver to the root prim if the touched prim doesn't handle touches |
312 | // or if we're meant to pass on touches anyway. | 312 | // or if we're meant to pass on touches anyway. |
313 | if (((part.ScriptEvents & scriptEvents.touch_start) == 0) || | 313 | if (((part.ScriptEvents & scriptEvents.touch_start) == 0) || |
314 | (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) | 314 | (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) |
315 | { | 315 | { |
316 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); | 316 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, offsetPos, remoteClient, surfaceArg); |
317 | } | 317 | } |
318 | } | 318 | } |
319 | 319 | ||
@@ -343,15 +343,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
343 | if (surfaceArgs != null && surfaceArgs.Count > 0) | 343 | if (surfaceArgs != null && surfaceArgs.Count > 0) |
344 | surfaceArg = surfaceArgs[0]; | 344 | surfaceArg = surfaceArgs[0]; |
345 | 345 | ||
346 | Vector3 grabOffset = pos - part.AbsolutePosition; | ||
346 | // If the touched prim handles touches, deliver it | 347 | // If the touched prim handles touches, deliver it |
347 | if ((part.ScriptEvents & scriptEvents.touch) != 0) | 348 | if ((part.ScriptEvents & scriptEvents.touch) != 0) |
348 | EventManager.TriggerObjectGrabbing(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); | 349 | // EventManager.TriggerObjectGrabbing(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); |
350 | EventManager.TriggerObjectGrabbing(part.LocalId, 0, grabOffset, remoteClient, surfaceArg); | ||
349 | // Deliver to the root prim if the touched prim doesn't handle touches | 351 | // Deliver to the root prim if the touched prim doesn't handle touches |
350 | // or if we're meant to pass on touches anyway. | 352 | // or if we're meant to pass on touches anyway. |
351 | if (((part.ScriptEvents & scriptEvents.touch) == 0) || | 353 | if (((part.ScriptEvents & scriptEvents.touch) == 0) || |
352 | (part.PassTouches && (part.LocalId != group.RootPart.LocalId))) | 354 | (part.PassTouches && (part.LocalId != group.RootPart.LocalId))) |
353 | { | 355 | { |
354 | EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); | 356 | // EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); |
357 | EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, grabOffset, remoteClient, surfaceArg); | ||
355 | } | 358 | } |
356 | } | 359 | } |
357 | 360 | ||