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

Merge branch 'master' into bigmerge 

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
avinationmerge
Melanie 2011-11-06 20:54:13 +00:00
parent 84a61cd00b 559e6e52f5
commit 323b76cee4
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11385,7 +11385,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// It's a ghost! tell the client to delete it from view. // It's a ghost! tell the client to delete it from view.
simClient.SendKillObject(Scene.RegionInfo.RegionHandle, simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
new List<uint>() { localId }); new List<uint> { localId });
} }
else else
{ {

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

@ -548,6 +548,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (!silent) if (!silent)
{ {
// Killing it here will cause the client to deselect it
// It then reappears on the avatar, deselected
// through the full update below
//
if (so.IsSelected)
{
m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
}
so.IsSelected = false; // fudge.... so.IsSelected = false; // fudge....
so.ScheduleGroupForFullUpdate(); so.ScheduleGroupForFullUpdate();
} }

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -571,7 +571,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected void KillEntity(Scene scene, uint localID) protected void KillEntity(Scene scene, uint localID)
{ {
scene.SendKillObject(new List<uint>() { localID }); scene.SendKillObject(new List<uint> { localID });
} }
protected virtual GridRegion GetFinalDestination(GridRegion region) protected virtual GridRegion GetFinalDestination(GridRegion region)

3
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@ -107,8 +107,7 @@ namespace OpenSim.Region.Framework.Scenes
List<uint> killIDs = new List<uint>(); List<uint> killIDs = new List<uint>();
foreach (SceneObjectGroup g in objectGroups) foreach (SceneObjectGroup g in objectGroups)
{ { killIDs.Add(g.LocalId);
killIDs.Add(g.LocalId);
g.DeleteGroupFromScene(true); g.DeleteGroupFromScene(true);
} }

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

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

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

@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) ||
(AttachmentPoint < 31) || (AttachmentPoint > 38)) (AttachmentPoint < 31) || (AttachmentPoint > 38))
avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId}); avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
} }
} }
}); });