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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-11-08 03:08:02 +00:00
parent 8a97d58f09 798abd1508
commit df0787f5cf
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5165,7 +5165,6 @@ namespace OpenSim.Region.Framework.Scenes
});
}
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
if (objectsToDelete.Count > 0)
{
m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@ -5175,12 +5174,6 @@ namespace OpenSim.Region.Framework.Scenes
DeleteSceneObject(grp, true);
}
m_log.Debug("[SCENE]: Finished dropped attachment deletion");
=======
foreach (SceneObjectGroup grp in objectsToDelete)
{
m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
DeleteSceneObject(grp, true);
>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
}
}
}