diff options
author | Melanie Thielker | 2008-08-27 22:53:58 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-27 22:53:58 +0000 |
commit | 5525a3ecb424ce6180198b5f4e440d6d5f065346 (patch) | |
tree | 01526d143e42a05d97b5375e9cfbdc9280c7b243 /OpenSim/Region/Environment/Scenes | |
parent | Refactor XScriptInstance to IScriptInstance and move into Shared/. Now (diff) | |
download | opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.zip opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.gz opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.bz2 opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.xz |
Thank you, salahazar, for a patch that corrects the behavior of
llDetectedLink(). Also a small refactor to remove an interface member
from IScriptEngine.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index 1dd2273..d48ef0c 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
83 | 83 | ||
84 | public event OnShutdownDelegate OnShutdown; | 84 | public event OnShutdownDelegate OnShutdown; |
85 | 85 | ||
86 | public delegate void ObjectGrabDelegate(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); | 86 | public delegate void ObjectGrabDelegate(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient); |
87 | public delegate void ObjectDeGrabDelegate(uint localID, IClientAPI remoteClient); | 87 | public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient); |
88 | public delegate void ScriptResetDelegate(uint localID, LLUUID itemID); | 88 | public delegate void ScriptResetDelegate(uint localID, LLUUID itemID); |
89 | 89 | ||
90 | public delegate void OnPermissionErrorDelegate(LLUUID user, string reason); | 90 | public delegate void OnPermissionErrorDelegate(LLUUID user, string reason); |
@@ -492,21 +492,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
492 | handlerShutdown(); | 492 | handlerShutdown(); |
493 | } | 493 | } |
494 | 494 | ||
495 | public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 495 | public void TriggerObjectGrab(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient) |
496 | { | 496 | { |
497 | handlerObjectGrab = OnObjectGrab; | 497 | handlerObjectGrab = OnObjectGrab; |
498 | if (handlerObjectGrab != null) | 498 | if (handlerObjectGrab != null) |
499 | { | 499 | { |
500 | handlerObjectGrab(localID, offsetPos, remoteClient); | 500 | handlerObjectGrab(localID, originalID, offsetPos, remoteClient); |
501 | } | 501 | } |
502 | } | 502 | } |
503 | 503 | ||
504 | public void TriggerObjectDeGrab(uint localID, IClientAPI remoteClient) | 504 | public void TriggerObjectDeGrab(uint localID, uint originalID, IClientAPI remoteClient) |
505 | { | 505 | { |
506 | handlerObjectDeGrab = OnObjectDeGrab; | 506 | handlerObjectDeGrab = OnObjectDeGrab; |
507 | if (handlerObjectDeGrab != null) | 507 | if (handlerObjectDeGrab != null) |
508 | { | 508 | { |
509 | handlerObjectDeGrab(localID, remoteClient); | 509 | handlerObjectDeGrab(localID, originalID, remoteClient); |
510 | } | 510 | } |
511 | } | 511 | } |
512 | 512 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index d534ffc..14d6826 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -243,9 +243,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
243 | // If the touched prim handles touches, deliver it | 243 | // If the touched prim handles touches, deliver it |
244 | // If not, deliver to root prim | 244 | // If not, deliver to root prim |
245 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) | 245 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) |
246 | EventManager.TriggerObjectGrab(part.LocalId, part.OffsetPosition, remoteClient); | 246 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient); |
247 | else | 247 | else |
248 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.OffsetPosition, remoteClient); | 248 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient); |
249 | 249 | ||
250 | return; | 250 | return; |
251 | } | 251 | } |
@@ -274,9 +274,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
274 | // If the touched prim handles touches, deliver it | 274 | // If the touched prim handles touches, deliver it |
275 | // If not, deliver to root prim | 275 | // If not, deliver to root prim |
276 | if ((part.ScriptEvents & scriptEvents.touch_end) != 0) | 276 | if ((part.ScriptEvents & scriptEvents.touch_end) != 0) |
277 | EventManager.TriggerObjectDeGrab(part.LocalId, remoteClient); | 277 | EventManager.TriggerObjectDeGrab(part.LocalId, 0, remoteClient); |
278 | else | 278 | else |
279 | EventManager.TriggerObjectDeGrab(obj.RootPart.LocalId, remoteClient); | 279 | EventManager.TriggerObjectDeGrab(obj.RootPart.LocalId, part.LocalId, remoteClient); |
280 | 280 | ||
281 | return; | 281 | return; |
282 | } | 282 | } |