aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-11-08 03:08:02 +0000
committerMelanie2010-11-08 03:08:02 +0000
commitdf0787f5cfa533cfc7b91f608f3efda08707749b (patch)
tree7231029006f03955074d4e4e429e551cd67118cd /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentReinstate a lost fix (diff)
downloadopensim-SC-df0787f5cfa533cfc7b91f608f3efda08707749b.zip
opensim-SC-df0787f5cfa533cfc7b91f608f3efda08707749b.tar.gz
opensim-SC-df0787f5cfa533cfc7b91f608f3efda08707749b.tar.bz2
opensim-SC-df0787f5cfa533cfc7b91f608f3efda08707749b.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e3f0693..ae48c02 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5165,7 +5165,6 @@ namespace OpenSim.Region.Framework.Scenes
5165 }); 5165 });
5166 } 5166 }
5167 5167
5168<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
5169 if (objectsToDelete.Count > 0) 5168 if (objectsToDelete.Count > 0)
5170 { 5169 {
5171 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count); 5170 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@@ -5175,12 +5174,6 @@ namespace OpenSim.Region.Framework.Scenes
5175 DeleteSceneObject(grp, true); 5174 DeleteSceneObject(grp, true);
5176 } 5175 }
5177 m_log.Debug("[SCENE]: Finished dropped attachment deletion"); 5176 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
5184 } 5177 }
5185 } 5178 }
5186 } 5179 }