OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove pointless region handle paramter from IClientAPI.SendKillObject()

user_profiles
Justin Clark-Casey (justincc) 2013-05-09 18:12:17 +01:00
parent 2cb2f1d7e3
commit 3290cd09d3
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@ -1097,9 +1097,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);

5
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1588,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(pc, ThrottleOutPacketType.Unknown);
}
public void SendKillObject(ulong regionHandle, List<uint> localIDs)
public void SendKillObject(List<uint> localIDs)
{
// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
@ -11555,8 +11555,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (part == null)
{
// It's a ghost! tell the client to delete it from view.
simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
new List<uint> { localId });
simClient.SendKillObject(new List<uint> { localId });
}
else
{

2
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -776,7 +776,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_scene.ForEachClient(
client =>
{ if (client.AgentId != so.AttachedAvatar)
client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List<uint>() { so.LocalId });
client.SendKillObject(new List<uint>() { so.LocalId });
});
}

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3480,7 +3480,7 @@ namespace OpenSim.Region.Framework.Scenes
delegate(IClientAPI client)
{
//We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway
try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); }
try { client.SendKillObject(new List<uint> { avatar.LocalId }); }
catch (NullReferenceException) { }
});
}
@ -3560,7 +3560,8 @@ namespace OpenSim.Region.Framework.Scenes
}
deleteIDs.Add(localID);
}
ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
ForEachClient(c => c.SendKillObject(deleteIDs));
}
#endregion

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1247,7 +1247,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!IsAttachment
|| AttachedAvatar == sp.UUID
|| !HasPrivateAttachmentPoint)
sp.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
}
}
});

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -950,7 +950,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendKillObject(ulong regionHandle, List<uint> localID)
public void SendKillObject(List<uint> localID)
{
}

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
}
public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
public virtual void SendKillObject(List<uint> localID)
{
}

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -517,10 +517,9 @@ namespace OpenSim.Tests.Common.Mock
public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
{
}
public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
public virtual void SendKillObject(List<uint> localID)
{
ReceivedKills.AddRange(localID);
}
@ -534,7 +533,6 @@ namespace OpenSim.Tests.Common.Mock
return new byte[0];
}
public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
{
}