diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 2bd1f1c..8d12a94 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -217,6 +217,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
217 | 217 | ||
218 | List<EntityBase> EntityList = GetEntities(); | 218 | List<EntityBase> EntityList = GetEntities(); |
219 | 219 | ||
220 | SurfaceTouchEventArgs surfaceArg = null; | ||
221 | if (surfaceArgs != null && surfaceArgs.Count > 0) | ||
222 | surfaceArg = surfaceArgs[0]; | ||
223 | |||
220 | foreach (EntityBase ent in EntityList) | 224 | foreach (EntityBase ent in EntityList) |
221 | { | 225 | { |
222 | if (ent is SceneObjectGroup) | 226 | if (ent is SceneObjectGroup) |
@@ -236,9 +240,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
236 | // If the touched prim handles touches, deliver it | 240 | // If the touched prim handles touches, deliver it |
237 | // If not, deliver to root prim | 241 | // If not, deliver to root prim |
238 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) | 242 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) |
239 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient); | 243 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); |
240 | else | 244 | else |
241 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient); | 245 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); |
242 | 246 | ||
243 | return; | 247 | return; |
244 | } | 248 | } |