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

Fix merge artefacts

avinationmerge
Melanie 2010-11-08 02:58:33 +00:00
parent 18b27408d6
commit 6056ae8d88
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,6 +174,7 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_firstHeartbeat = true; private bool m_firstHeartbeat = true;
private object m_deleting_scene_object = new object(); private object m_deleting_scene_object = new object();
private object m_cleaningAttachments = new object();
private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
private bool m_reprioritizationEnabled = true; private bool m_reprioritizationEnabled = true;
@ -4995,25 +4996,29 @@ namespace OpenSim.Region.Framework.Scenes
List<SceneObjectGroup> objectsToDelete = List<SceneObjectGroup> objectsToDelete =
new List<SceneObjectGroup>(); new List<SceneObjectGroup>();
ForEachSOG(delegate (SceneObjectGroup grp) lock (m_cleaningAttachments)
{ {
if (grp.RootPart.Shape.State != 0) ForEachSOG(delegate (SceneObjectGroup grp)
{ {
if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
{ {
objectsToDelete.Add(grp); UUID agentID = grp.OwnerID;
return; if (agentID == UUID.Zero)
} {
objectsToDelete.Add(grp);
return;
}
ScenePresence sp = GetScenePresence(agentID); ScenePresence sp = GetScenePresence(agentID);
if (sp == null) if (sp == null)
{ {
objectsToDelete.Add(grp); objectsToDelete.Add(grp);
return; return;
}
} }
} });
}); }
foreach (SceneObjectGroup grp in objectsToDelete) foreach (SceneObjectGroup grp in objectsToDelete)
{ {
m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);