diff options
author | teravus | 2012-11-15 09:46:41 -0500 |
---|---|---|
committer | teravus | 2012-11-15 09:46:41 -0500 |
commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Framework/IClientAPI.cs | |
parent | * Fixes mesh loading issues in last commit. (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz |
Merge master into teravuswork
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index e31c7f6..1c6685a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -815,8 +815,23 @@ namespace OpenSim.Framework | |||
815 | event Action<IClientAPI> OnRegionHandShakeReply; | 815 | event Action<IClientAPI> OnRegionHandShakeReply; |
816 | event GenericCall1 OnRequestWearables; | 816 | event GenericCall1 OnRequestWearables; |
817 | event Action<IClientAPI, bool> OnCompleteMovementToRegion; | 817 | event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
818 | |||
819 | /// <summary> | ||
820 | /// Called when an AgentUpdate message is received and before OnAgentUpdate. | ||
821 | /// </summary> | ||
822 | /// <remarks> | ||
823 | /// Listeners must not retain a reference to AgentUpdateArgs since this object may be reused for subsequent AgentUpdates. | ||
824 | /// </remarks> | ||
818 | event UpdateAgent OnPreAgentUpdate; | 825 | event UpdateAgent OnPreAgentUpdate; |
826 | |||
827 | /// <summary> | ||
828 | /// Called when an AgentUpdate message is received and after OnPreAgentUpdate. | ||
829 | /// </summary> | ||
830 | /// <remarks> | ||
831 | /// Listeners must not retain a reference to AgentUpdateArgs since this object may be reused for subsequent AgentUpdates. | ||
832 | /// </remarks> | ||
819 | event UpdateAgent OnAgentUpdate; | 833 | event UpdateAgent OnAgentUpdate; |
834 | |||
820 | event AgentRequestSit OnAgentRequestSit; | 835 | event AgentRequestSit OnAgentRequestSit; |
821 | event AgentSit OnAgentSit; | 836 | event AgentSit OnAgentSit; |
822 | event AvatarPickerRequest OnAvatarPickerRequest; | 837 | event AvatarPickerRequest OnAvatarPickerRequest; |
@@ -1046,8 +1061,21 @@ namespace OpenSim.Framework | |||
1046 | 1061 | ||
1047 | void InPacket(object NewPack); | 1062 | void InPacket(object NewPack); |
1048 | void ProcessInPacket(Packet NewPack); | 1063 | void ProcessInPacket(Packet NewPack); |
1064 | |||
1065 | /// <summary> | ||
1066 | /// Close this client | ||
1067 | /// </summary> | ||
1049 | void Close(); | 1068 | void Close(); |
1050 | void Close(bool sendStop); | 1069 | |
1070 | /// <summary> | ||
1071 | /// Close this client | ||
1072 | /// </summary> | ||
1073 | /// <param name='force'> | ||
1074 | /// If true, attempts the close without checking active status. You do not want to try this except as a last | ||
1075 | /// ditch attempt where Active == false but the ScenePresence still exists. | ||
1076 | /// </param> | ||
1077 | void Close(bool sendStop, bool force); | ||
1078 | |||
1051 | void Kick(string message); | 1079 | void Kick(string message); |
1052 | 1080 | ||
1053 | /// <summary> | 1081 | /// <summary> |
@@ -1084,8 +1112,20 @@ namespace OpenSim.Framework | |||
1084 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 1112 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |
1085 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); | 1113 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); |
1086 | 1114 | ||
1087 | void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, | 1115 | /// <summary> |
1088 | byte audible); | 1116 | /// Send chat to the viewer. |
1117 | /// </summary> | ||
1118 | /// <param name='message'></param> | ||
1119 | /// <param name='type'></param> | ||
1120 | /// <param name='fromPos'></param> | ||
1121 | /// <param name='fromName'></param> | ||
1122 | /// <param name='fromAgentID'></param> | ||
1123 | /// <param name='ownerID'></param> | ||
1124 | /// <param name='source'></param> | ||
1125 | /// <param name='audible'></param> | ||
1126 | void SendChatMessage( | ||
1127 | string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source, | ||
1128 | byte audible); | ||
1089 | 1129 | ||
1090 | void SendInstantMessage(GridInstantMessage im); | 1130 | void SendInstantMessage(GridInstantMessage im); |
1091 | 1131 | ||