From 0644977819c1704c9d7417984a6366ceefe04c4c Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 10 Oct 2008 17:05:43 +0000
Subject: added a list of SurfaceTouchEventArgs to the IClientAPI.OnGrab event,
 for the new surface touch parameters in 1.21 viewers.

---
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +-
 OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index b438709..d0fbfb9 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event RequestGodlikePowers OnRequestGodlikePowers;
         public event GodKickUser OnGodKickUser;
         public event ObjectDuplicate OnObjectDuplicate;
-        public event UpdateVector OnGrabObject;
+        public event GrabObject OnGrabObject;
         public event ObjectSelect OnDeGrabObject;
         public event MoveObject OnGrabUpdate;
         public event ViewerEffectEventHandler OnViewerEffect;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index b60efdc..e9a381d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_eventManager.TriggerLandBuy(this, args);
         }
 
-        public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient)
+        public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
 
             List<EntityBase> EntityList = GetEntities();
-- 
cgit v1.1