From 9d63f90467dbc60622a49f564a56fdd20de90f51 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 26 Nov 2009 17:03:09 +0000
Subject: Remove the old (Remoting) region crossing code. Fix the new code to
 pass script state and assembly again properly. Reintroduce respecting tht
 TrustBinaries flag. Changes the interregion protocol! No version bump because
 it was broken anyway, so with a version mismatch it will simply stay broken,
 but not crash. Region corssing still doesn't work because there is still
 monkey business with both rezzed prims being pushed across a border and
 attached prims when walking across a border. Teleport is untested by may
 work.

---
 OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs')

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 5b571c7..9a7863b 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -131,11 +131,6 @@ namespace OpenSim.Region.Framework.Scenes
                     if (left > 0)
                     {
                         x = m_inventoryDeletes.Dequeue();
-                        if (!x.objectGroup.CanBeDeleted())
-                        {
-                            m_inventoryDeletes.Enqueue(x);
-                            return true;
-                        }
 
                         m_log.DebugFormat(
                             "[SCENE]: Sending object to user's inventory, {0} item(s) remaining.", left);
-- 
cgit v1.1