aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-28 18:49:32 +0100
committerJustin Clark-Casey (justincc)2010-05-28 18:49:32 +0100
commit6b568af5658c07212288429d2e5c77849ffab9e5 (patch)
treef7adadf9fb54558ef93e8f5fecfbda5152e4a1d9
parentcomment out large chunks of appearance/inventory region access services to el... (diff)
downloadopensim-SC_OLD-6b568af5658c07212288429d2e5c77849ffab9e5.zip
opensim-SC_OLD-6b568af5658c07212288429d2e5c77849ffab9e5.tar.gz
opensim-SC_OLD-6b568af5658c07212288429d2e5c77849ffab9e5.tar.bz2
opensim-SC_OLD-6b568af5658c07212288429d2e5c77849ffab9e5.tar.xz
Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
This is going to be the right behaviour in all cases, I should think. This means that avatars in region when an oar is loaded do not lose their attachments
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 46fbcd3..6d4de90 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2121,7 +2121,7 @@ namespace OpenSim.Region.Framework.Scenes
2121 } 2121 }
2122 2122
2123 /// <summary> 2123 /// <summary>
2124 /// Delete every object from the scene 2124 /// Delete every object from the scene. This does not include attachments worn by avatars.
2125 /// </summary> 2125 /// </summary>
2126 public void DeleteAllSceneObjects() 2126 public void DeleteAllSceneObjects()
2127 { 2127 {
@@ -2132,7 +2132,11 @@ namespace OpenSim.Region.Framework.Scenes
2132 foreach (EntityBase e in entities) 2132 foreach (EntityBase e in entities)
2133 { 2133 {
2134 if (e is SceneObjectGroup) 2134 if (e is SceneObjectGroup)
2135 DeleteSceneObject((SceneObjectGroup)e, false); 2135 {
2136 SceneObjectGroup sog = (SceneObjectGroup)e;
2137 if (!sog.IsAttachment)
2138 DeleteSceneObject((SceneObjectGroup)e, false);
2139 }
2136 } 2140 }
2137 } 2141 }
2138 } 2142 }