diff options
author | Melanie | 2013-05-08 21:51:48 +0100 |
---|---|---|
committer | Melanie | 2013-05-08 21:51:48 +0100 |
commit | cdaceea5a633683c713f084d9beb93a14061772f (patch) | |
tree | 66798e45deff0d13e78740130dde68955a3ba86c /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Guard the scene list when estates are updated (diff) | |
download | opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.zip opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.gz opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.bz2 opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index c88828b..9631a46 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; |
@@ -1100,6 +1102,8 @@ namespace OpenSim.Framework | |||
1100 | /// <param name="textureEntry"></param> | 1102 | /// <param name="textureEntry"></param> |
1101 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); | 1103 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); |
1102 | 1104 | ||
1105 | void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures); | ||
1106 | |||
1103 | void SendStartPingCheck(byte seq); | 1107 | void SendStartPingCheck(byte seq); |
1104 | 1108 | ||
1105 | /// <summary> | 1109 | /// <summary> |