diff options
| author | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
| commit | 377bc27c1fdab6f45135194a53ba17cce1f3388f (patch) | |
| tree | 51e2bbc45c30dfceed0311452ad9b30532d7bd13 /OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |
| parent | Bump trunk version number to 0.6.9. (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.zip opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.gz opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.bz2 opensim-SC_OLD-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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); |