diff options
added a list of SurfaceTouchEventArgs to the IClientAPI.OnGrab event, for the new surface touch parameters in 1.21 viewers.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 2 |
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(); |