aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.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/Scene.PacketHandlers.cs
parentRefactor XScriptInstance to IScriptInstance and move into Shared/. Now (diff)
downloadopensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.zip
opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.gz
opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.bz2
opensim-SC-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/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs8
1 files changed, 4 insertions, 4 deletions
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 }