diff options
author | Justin Clark-Casey (justincc) | 2010-05-28 18:49:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-28 18:52:30 +0100 |
commit | c7d812802fcb2531c49f0fe4f4971571f332183d (patch) | |
tree | d71d9f69be845aed5aef68816ac032c4857dc32e /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | commit code which stops full updates being fired multiple times when attachme... (diff) | |
download | opensim-SC-c7d812802fcb2531c49f0fe4f4971571f332183d.zip opensim-SC-c7d812802fcb2531c49f0fe4f4971571f332183d.tar.gz opensim-SC-c7d812802fcb2531c49f0fe4f4971571f332183d.tar.bz2 opensim-SC-c7d812802fcb2531c49f0fe4f4971571f332183d.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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index dd2d2cc..f8ca047 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1908,7 +1908,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1908 | } | 1908 | } |
1909 | 1909 | ||
1910 | /// <summary> | 1910 | /// <summary> |
1911 | /// Delete every object from the scene | 1911 | /// Delete every object from the scene. This does not include attachments worn by avatars. |
1912 | /// </summary> | 1912 | /// </summary> |
1913 | public void DeleteAllSceneObjects() | 1913 | public void DeleteAllSceneObjects() |
1914 | { | 1914 | { |
@@ -1919,7 +1919,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1919 | foreach (EntityBase e in entities) | 1919 | foreach (EntityBase e in entities) |
1920 | { | 1920 | { |
1921 | if (e is SceneObjectGroup) | 1921 | if (e is SceneObjectGroup) |
1922 | DeleteSceneObject((SceneObjectGroup)e, false); | 1922 | { |
1923 | SceneObjectGroup sog = (SceneObjectGroup)e; | ||
1924 | if (!sog.IsAttachment) | ||
1925 | DeleteSceneObject((SceneObjectGroup)e, false); | ||
1926 | } | ||
1923 | } | 1927 | } |
1924 | } | 1928 | } |
1925 | } | 1929 | } |