diff options
author | Melanie | 2009-11-26 17:03:09 +0000 |
---|---|---|
committer | Melanie | 2009-11-26 17:03:09 +0000 |
commit | 9d63f90467dbc60622a49f564a56fdd20de90f51 (patch) | |
tree | 277a246a036dfe70204d10f0d86140b2e8a3b901 /OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |
parent | Remove the old remoting-type interregion code for prim/script crossing (diff) | |
download | opensim-SC-9d63f90467dbc60622a49f564a56fdd20de90f51.zip opensim-SC-9d63f90467dbc60622a49f564a56fdd20de90f51.tar.gz opensim-SC-9d63f90467dbc60622a49f564a56fdd20de90f51.tar.bz2 opensim-SC-9d63f90467dbc60622a49f564a56fdd20de90f51.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | 5 |
1 files changed, 0 insertions, 5 deletions
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 | |||
131 | if (left > 0) | 131 | if (left > 0) |
132 | { | 132 | { |
133 | x = m_inventoryDeletes.Dequeue(); | 133 | x = m_inventoryDeletes.Dequeue(); |
134 | if (!x.objectGroup.CanBeDeleted()) | ||
135 | { | ||
136 | m_inventoryDeletes.Enqueue(x); | ||
137 | return true; | ||
138 | } | ||
139 | 134 | ||
140 | m_log.DebugFormat( | 135 | m_log.DebugFormat( |
141 | "[SCENE]: Sending object to user's inventory, {0} item(s) remaining.", left); | 136 | "[SCENE]: Sending object to user's inventory, {0} item(s) remaining.", left); |