From f6c8c10d3fce8eb279608cdeb9d8154fbca3852c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 5 Nov 2007 14:38:58 +0000 Subject: * Substituted som 'GenericCall' with Action<> * OnRequestWearables does no longer accept 'Client' as param, since it's always on the current client * Fixed SendOwnWearables to always operate on self, as that's what it does --- OpenSim/Region/ClientStack/ClientView.API.cs | 8 ++++---- OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index b02fcf6..1ffcd5e 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -48,15 +48,15 @@ namespace OpenSim.Region.ClientStack public event RezObject OnRezObject; public event GenericCall4 OnDeRezObject; public event ModifyTerrain OnModifyTerrain; - public event GenericCall OnRegionHandShakeReply; - public event GenericCall OnRequestWearables; + public event Action OnRegionHandShakeReply; + public event GenericCall2 OnRequestWearables; public event SetAppearance OnSetAppearance; public event GenericCall2 OnCompleteMovementToRegion; public event UpdateAgent OnAgentUpdate; public event AgentRequestSit OnAgentRequestSit; public event AgentSit OnAgentSit; public event StartAnim OnStartAnim; - public event GenericCall OnRequestAvatarsData; + public event Action OnRequestAvatarsData; public event LinkObjects OnLinkObjects; public event UpdateVector OnGrabObject; public event ObjectSelect OnDeGrabObject; @@ -79,7 +79,7 @@ namespace OpenSim.Region.ClientStack public event UpdateVector OnUpdatePrimScale; public event StatusChange OnChildAgentStatus; public event GenericCall2 OnStopMovement; - public event GenericCall6 OnRemoveAvatar; + public event Action OnRemoveAvatar; public event RequestMapBlocks OnRequestMapBlocks; public event TeleportLocationRequest OnTeleportLocationRequest; public event DisconnectUser OnDisconnectUser; diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 7c1a663..7a778e8 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs @@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack case PacketType.AgentWearablesRequest: if (OnRequestWearables != null) { - OnRequestWearables(this); + OnRequestWearables( ); } if (OnRequestAvatarsData != null) { -- cgit v1.1