diff options
author | Melanie | 2009-10-02 08:23:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 08:23:38 +0100 |
commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/IClientAPI.cs | |
parent | Restore the missing image handling to the image manager. The missing (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz |
Merge branch 'master' into diva-textures
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 91a5d5c..d3bd9e7 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -810,7 +810,7 @@ namespace OpenSim.Framework | |||
810 | /// </summary> | 810 | /// </summary> |
811 | void Start(); | 811 | void Start(); |
812 | 812 | ||
813 | void Stop(); | 813 | void Stop(); |
814 | 814 | ||
815 | // void ActivateGesture(UUID assetId, UUID gestureId); | 815 | // void ActivateGesture(UUID assetId, UUID gestureId); |
816 | 816 | ||
@@ -824,7 +824,7 @@ namespace OpenSim.Framework | |||
824 | /// </summary> | 824 | /// </summary> |
825 | /// <param name="agentID">The id of the agent associated with the appearance</param> | 825 | /// <param name="agentID">The id of the agent associated with the appearance</param> |
826 | /// <param name="visualParams"></param> | 826 | /// <param name="visualParams"></param> |
827 | /// <param name="textureEntry"></param> | 827 | /// <param name="textureEntry"></param> |
828 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); | 828 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); |
829 | 829 | ||
830 | void SendStartPingCheck(byte seq); | 830 | void SendStartPingCheck(byte seq); |
@@ -833,7 +833,7 @@ namespace OpenSim.Framework | |||
833 | /// Tell the client that an object has been deleted | 833 | /// Tell the client that an object has been deleted |
834 | /// </summary> | 834 | /// </summary> |
835 | /// <param name="regionHandle"></param> | 835 | /// <param name="regionHandle"></param> |
836 | /// <param name="localID"></param> | 836 | /// <param name="localID"></param> |
837 | void SendKillObject(ulong regionHandle, uint localID); | 837 | void SendKillObject(ulong regionHandle, uint localID); |
838 | 838 | ||
839 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 839 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |