diff options
| author | Tom Grimshaw | 2010-06-26 11:24:36 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-26 11:24:36 -0700 |
| commit | acab2a159d150072aa9952100aa6722cbd51c1ea (patch) | |
| tree | 299b3375f85e4aa8e9a218013c5b3849d5dda7ed /OpenSim/Region/Framework/Scenes | |
| parent | Add a DeleteAllSceneObjects(bool exceptNoCopy) method to allow NoCopy object... (diff) | |
| download | opensim-SC_OLD-acab2a159d150072aa9952100aa6722cbd51c1ea.zip opensim-SC_OLD-acab2a159d150072aa9952100aa6722cbd51c1ea.tar.gz opensim-SC_OLD-acab2a159d150072aa9952100aa6722cbd51c1ea.tar.bz2 opensim-SC_OLD-acab2a159d150072aa9952100aa6722cbd51c1ea.tar.xz | |
Return objects which are NoCopy instead of just leaving them when cleaning the scene, if exceptNoCopy = true.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c596baa..abc7377 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2206,6 +2206,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2206 | { | 2206 | { |
| 2207 | DeleteSceneObject((SceneObjectGroup)e, false); | 2207 | DeleteSceneObject((SceneObjectGroup)e, false); |
| 2208 | } | 2208 | } |
| 2209 | else | ||
| 2210 | { | ||
| 2211 | DeRezObject(null, sog.RootPart.LocalId, sog.RootPart.GroupID, DeRezAction.Return, UUID.Zero); | ||
| 2212 | } | ||
| 2209 | } | 2213 | } |
| 2210 | } | 2214 | } |
| 2211 | } | 2215 | } |