diff options
author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'master' into mantis5110 (diff) | |
parent | Configuration of persistent baked textures and save/send delays. (diff) | |
download | opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 94815cd..027f9c5 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Framework | |||
43 | 43 | ||
44 | public delegate void TextureRequest(Object sender, TextureRequestArgs e); | 44 | public delegate void TextureRequest(Object sender, TextureRequestArgs e); |
45 | 45 | ||
46 | public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e); | 46 | public delegate void AvatarNowWearing(IClientAPI sender, AvatarWearingArgs e); |
47 | 47 | ||
48 | public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im); | 48 | public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im); |
49 | 49 | ||
@@ -65,7 +65,7 @@ namespace OpenSim.Framework | |||
65 | 65 | ||
66 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); | 66 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); |
67 | 67 | ||
68 | public delegate void SetAppearance(Primitive.TextureEntry textureEntry, byte[] visualParams); | 68 | public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams); |
69 | 69 | ||
70 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); | 70 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); |
71 | 71 | ||
@@ -711,7 +711,7 @@ namespace OpenSim.Framework | |||
711 | event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 711 | event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
712 | event DeRezObject OnDeRezObject; | 712 | event DeRezObject OnDeRezObject; |
713 | event Action<IClientAPI> OnRegionHandShakeReply; | 713 | event Action<IClientAPI> OnRegionHandShakeReply; |
714 | event GenericCall2 OnRequestWearables; | 714 | event GenericCall1 OnRequestWearables; |
715 | event GenericCall1 OnCompleteMovementToRegion; | 715 | event GenericCall1 OnCompleteMovementToRegion; |
716 | event UpdateAgent OnPreAgentUpdate; | 716 | event UpdateAgent OnPreAgentUpdate; |
717 | event UpdateAgent OnAgentUpdate; | 717 | event UpdateAgent OnAgentUpdate; |