diff options
| author | Melanie Thielker | 2008-10-22 03:49:38 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-22 03:49:38 +0000 |
| commit | a8523dddb6ff87f9cce24cd8ac5cd4bae1119ab6 (patch) | |
| tree | 6ab6d8b084485f7435dec21f3010571fa79c34de | |
| parent | Remove the gratuitious prim deletes caused by linking. This makes linking (diff) | |
| download | opensim-SC_OLD-a8523dddb6ff87f9cce24cd8ac5cd4bae1119ab6.zip opensim-SC_OLD-a8523dddb6ff87f9cce24cd8ac5cd4bae1119ab6.tar.gz opensim-SC_OLD-a8523dddb6ff87f9cce24cd8ac5cd4bae1119ab6.tar.bz2 opensim-SC_OLD-a8523dddb6ff87f9cce24cd8ac5cd4bae1119ab6.tar.xz | |
Prevent an object with a null RootPart in delete queue from stopping
the deleting of other, valid objects
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index bd81a6d..cbcbc5c 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
| @@ -119,10 +119,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 119 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); | 119 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); |
| 120 | 120 | ||
| 121 | x = m_inventoryDeletes.Dequeue(); | 121 | x = m_inventoryDeletes.Dequeue(); |
| 122 | m_scene.DeleteToInventory(x.destination, | 122 | if (x.objectGroup.RootObject != null) |
| 123 | x.folderID, x.objectGroup, x.remoteClient, | 123 | { |
| 124 | x.permissionToDelete); | 124 | try |
| 125 | 125 | { | |
| 126 | m_scene.DeleteToInventory(x.destination, | ||
| 127 | x.folderID, x.objectGroup, x.remoteClient, | ||
| 128 | x.permissionToDelete); | ||
| 129 | } | ||
| 130 | catch (Exception e) | ||
| 131 | { | ||
| 132 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); | ||
| 133 | } | ||
| 134 | } | ||
| 126 | return true; | 135 | return true; |
| 127 | } | 136 | } |
| 128 | } | 137 | } |