From acab2a159d150072aa9952100aa6722cbd51c1ea Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Sat, 26 Jun 2010 11:24:36 -0700
Subject: Return objects which are NoCopy instead of just leaving  them when
 cleaning the scene, if exceptNoCopy = true.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim')

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
                             {
                                 DeleteSceneObject((SceneObjectGroup)e, false);
                             }
+                            else
+                            {
+                                DeRezObject(null, sog.RootPart.LocalId, sog.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                            }
                         }
                     }
                 }
-- 
cgit v1.1