ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
This commit is contained in:
Melanie
2013-05-11 02:35:26 +01:00
parent cdaceea5a6 55c9bc15e5
commit 13cd8c17d7
27 changed files with 206 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -1109,9 +1109,8 @@ namespace OpenSim.Framework
/// <summary>
/// Tell the client that an object has been deleted
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="localID"></param>
void SendKillObject(ulong regionHandle, List<uint> localID);
void SendKillObject(List<uint> localID);
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);