aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2008-10-10 17:05:43 +0000
committerMW2008-10-10 17:05:43 +0000
commit0644977819c1704c9d7417984a6366ceefe04c4c (patch)
tree924abff130d5a3b6948f40990c27becb83ab869e /OpenSim/Region/Environment
parentadded a list of SurfaceTouchEventArgs to the IClientAPI.OnGrabUpdate event, f... (diff)
downloadopensim-SC_OLD-0644977819c1704c9d7417984a6366ceefe04c4c.zip
opensim-SC_OLD-0644977819c1704c9d7417984a6366ceefe04c4c.tar.gz
opensim-SC_OLD-0644977819c1704c9d7417984a6366ceefe04c4c.tar.bz2
opensim-SC_OLD-0644977819c1704c9d7417984a6366ceefe04c4c.tar.xz
added a list of SurfaceTouchEventArgs to the IClientAPI.OnGrab event, for the new surface touch parameters in 1.21 viewers.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
2 files changed, 2 insertions, 2 deletions
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
197 public event RequestGodlikePowers OnRequestGodlikePowers; 197 public event RequestGodlikePowers OnRequestGodlikePowers;
198 public event GodKickUser OnGodKickUser; 198 public event GodKickUser OnGodKickUser;
199 public event ObjectDuplicate OnObjectDuplicate; 199 public event ObjectDuplicate OnObjectDuplicate;
200 public event UpdateVector OnGrabObject; 200 public event GrabObject OnGrabObject;
201 public event ObjectSelect OnDeGrabObject; 201 public event ObjectSelect OnDeGrabObject;
202 public event MoveObject OnGrabUpdate; 202 public event MoveObject OnGrabUpdate;
203 public event ViewerEffectEventHandler OnViewerEffect; 203 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
212 m_eventManager.TriggerLandBuy(this, args); 212 m_eventManager.TriggerLandBuy(this, args);
213 } 213 }
214 214
215 public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient) 215 public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
216 { 216 {
217 217
218 List<EntityBase> EntityList = GetEntities(); 218 List<EntityBase> EntityList = GetEntities();