diff options
| author | Melanie | 2013-05-11 01:29:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 01:29:30 +0100 |
| commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
| tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Framework/IClientAPI.cs | |
| parent | Send up the part missing from the Avination Estate commit. (diff) | |
| parent | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff) | |
| download | opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index cfb36fe..59ce2c4 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1097,9 +1097,8 @@ namespace OpenSim.Framework | |||
| 1097 | /// <summary> | 1097 | /// <summary> |
| 1098 | /// Tell the client that an object has been deleted | 1098 | /// Tell the client that an object has been deleted |
| 1099 | /// </summary> | 1099 | /// </summary> |
| 1100 | /// <param name="regionHandle"></param> | ||
| 1101 | /// <param name="localID"></param> | 1100 | /// <param name="localID"></param> |
| 1102 | void SendKillObject(ulong regionHandle, List<uint> localID); | 1101 | void SendKillObject(List<uint> localID); |
| 1103 | 1102 | ||
| 1104 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 1103 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |
| 1105 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); | 1104 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); |