aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ae48c02..e3f0693 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5165,6 +5165,7 @@ namespace OpenSim.Region.Framework.Scenes
5165 }); 5165 });
5166 } 5166 }
5167 5167
5168<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
5168 if (objectsToDelete.Count > 0) 5169 if (objectsToDelete.Count > 0)
5169 { 5170 {
5170 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count); 5171 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@@ -5174,6 +5175,12 @@ namespace OpenSim.Region.Framework.Scenes
5174 DeleteSceneObject(grp, true); 5175 DeleteSceneObject(grp, true);
5175 } 5176 }
5176 m_log.Debug("[SCENE]: Finished dropped attachment deletion"); 5177 m_log.Debug("[SCENE]: Finished dropped attachment deletion");
5178=======
5179 foreach (SceneObjectGroup grp in objectsToDelete)
5180 {
5181 m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5182 DeleteSceneObject(grp, true);
5183>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
5177 } 5184 }
5178 } 5185 }
5179 } 5186 }