diff options
| author | Teravus Ovares | 2008-04-30 16:52:12 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-04-30 16:52:12 +0000 |
| commit | b70da6ac1955ada29e1cb4dbe9aeb915735ec686 (patch) | |
| tree | 68f6f5f3e7fe2b0fd9a8e0c9baf2dbfafeb90882 /OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |
| parent | * Deal with a situation where the new fields in the inventory store are null ... (diff) | |
| download | opensim-SC_OLD-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.zip opensim-SC_OLD-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.gz opensim-SC_OLD-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.bz2 opensim-SC_OLD-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.xz | |
* Patch by Melanie. Implements proper objectflags on child objects. Thanks Melanie!
RE: 0001079: r4387. touch() event does not fire when touch script is in root prim and child prims are touched
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 71b2716..dccc09a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
| @@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 164 | 164 | ||
| 165 | // If the touched prim handles touches, deliver it | 165 | // If the touched prim handles touches, deliver it |
| 166 | // If not, deliver to root prim | 166 | // If not, deliver to root prim |
| 167 | if ((part.ObjectFlags & (uint)LLObject.ObjectFlags.Touch) != 0) | 167 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) |
| 168 | EventManager.TriggerObjectGrab(part.LocalId, part.OffsetPosition, remoteClient); | 168 | EventManager.TriggerObjectGrab(part.LocalId, part.OffsetPosition, remoteClient); |
| 169 | else | 169 | else |
| 170 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.OffsetPosition, remoteClient); | 170 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.OffsetPosition, remoteClient); |
| @@ -195,7 +195,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 195 | { | 195 | { |
| 196 | // If the touched prim handles touches, deliver it | 196 | // If the touched prim handles touches, deliver it |
| 197 | // If not, deliver to root prim | 197 | // If not, deliver to root prim |
| 198 | if ((part.ObjectFlags & (uint)LLObject.ObjectFlags.Touch) != 0) | 198 | if ((part.ScriptEvents & scriptEvents.touch_end) != 0) |
| 199 | EventManager.TriggerObjectDeGrab(part.LocalId, remoteClient); | 199 | EventManager.TriggerObjectDeGrab(part.LocalId, remoteClient); |
| 200 | else | 200 | else |
| 201 | EventManager.TriggerObjectDeGrab(obj.RootPart.LocalId, remoteClient); | 201 | EventManager.TriggerObjectDeGrab(obj.RootPart.LocalId, remoteClient); |