aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/EventManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-27 22:53:58 +0000
committerMelanie Thielker2008-08-27 22:53:58 +0000
commit5525a3ecb424ce6180198b5f4e440d6d5f065346 (patch)
tree01526d143e42a05d97b5375e9cfbdc9280c7b243 /OpenSim/Region/Environment/Scenes/EventManager.cs
parentRefactor XScriptInstance to IScriptInstance and move into Shared/. Now (diff)
downloadopensim-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 'OpenSim/Region/Environment/Scenes/EventManager.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/EventManager.cs12
1 files changed, 6 insertions, 6 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