diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index ad3471a..22cc79d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -65,6 +65,7 @@ namespace OpenSim.Framework | |||
65 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); | 65 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); |
66 | 66 | ||
67 | public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems); | 67 | public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems); |
68 | public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest); | ||
68 | 69 | ||
69 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); | 70 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); |
70 | 71 | ||
@@ -789,6 +790,7 @@ namespace OpenSim.Framework | |||
789 | event EstateChangeInfo OnEstateChangeInfo; | 790 | event EstateChangeInfo OnEstateChangeInfo; |
790 | event EstateManageTelehub OnEstateManageTelehub; | 791 | event EstateManageTelehub OnEstateManageTelehub; |
791 | // [Obsolete("LLClientView Specific.")] | 792 | // [Obsolete("LLClientView Specific.")] |
793 | event CachedTextureRequest OnCachedTextureRequest; | ||
792 | event SetAppearance OnSetAppearance; | 794 | event SetAppearance OnSetAppearance; |
793 | // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] | 795 | // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] |
794 | event AvatarNowWearing OnAvatarNowWearing; | 796 | event AvatarNowWearing OnAvatarNowWearing; |
@@ -832,6 +834,8 @@ namespace OpenSim.Framework | |||
832 | /// </remarks> | 834 | /// </remarks> |
833 | event UpdateAgent OnAgentUpdate; | 835 | event UpdateAgent OnAgentUpdate; |
834 | 836 | ||
837 | event UpdateAgent OnAgentCameraUpdate; | ||
838 | |||
835 | event AgentRequestSit OnAgentRequestSit; | 839 | event AgentRequestSit OnAgentRequestSit; |
836 | event AgentSit OnAgentSit; | 840 | event AgentSit OnAgentSit; |
837 | event AvatarPickerRequest OnAvatarPickerRequest; | 841 | event AvatarPickerRequest OnAvatarPickerRequest; |
@@ -1100,14 +1104,15 @@ namespace OpenSim.Framework | |||
1100 | /// <param name="textureEntry"></param> | 1104 | /// <param name="textureEntry"></param> |
1101 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); | 1105 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); |
1102 | 1106 | ||
1107 | void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures); | ||
1108 | |||
1103 | void SendStartPingCheck(byte seq); | 1109 | void SendStartPingCheck(byte seq); |
1104 | 1110 | ||
1105 | /// <summary> | 1111 | /// <summary> |
1106 | /// Tell the client that an object has been deleted | 1112 | /// Tell the client that an object has been deleted |
1107 | /// </summary> | 1113 | /// </summary> |
1108 | /// <param name="regionHandle"></param> | ||
1109 | /// <param name="localID"></param> | 1114 | /// <param name="localID"></param> |
1110 | void SendKillObject(ulong regionHandle, List<uint> localID); | 1115 | void SendKillObject(List<uint> localID); |
1111 | 1116 | ||
1112 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 1117 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |
1113 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); | 1118 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); |
@@ -1486,7 +1491,7 @@ namespace OpenSim.Framework | |||
1486 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); | 1491 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); |
1487 | void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId); | 1492 | void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId); |
1488 | 1493 | ||
1489 | void StopFlying(ISceneEntity presence); | 1494 | void SendAgentTerseUpdate(ISceneEntity presence); |
1490 | 1495 | ||
1491 | void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data); | 1496 | void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data); |
1492 | } | 1497 | } |