diff options
author | Justin Clarke Casey | 2008-11-17 15:52:27 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 15:52:27 +0000 |
commit | f16cf1284011c2376dedc3ac23919c5eb6abab5d (patch) | |
tree | 27d1958b122a748b501b9ab48e69dd5aa0640c02 /OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | |
parent | * Stop nulling SOG.m_rootPart and parts on object deletion (diff) | |
download | opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.zip opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.gz opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.bz2 opensim-SC_OLD-f16cf1284011c2376dedc3ac23919c5eb6abab5d.tar.xz |
* Fix probable partial breakage of delete to inventory in last commit
* Not nulling out parts and the root part allows the code to be simplified
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index 442b40d..97eb7a5 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -126,18 +126,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
126 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); | 126 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); |
127 | 127 | ||
128 | x = m_inventoryDeletes.Dequeue(); | 128 | x = m_inventoryDeletes.Dequeue(); |
129 | if (!x.objectGroup.IsDeleted) | 129 | |
130 | try | ||
131 | { | ||
132 | m_scene.DeleteToInventory(x.destination, | ||
133 | x.folderID, x.objectGroup, x.remoteClient, | ||
134 | x.permissionToDelete); | ||
135 | } | ||
136 | catch (Exception e) | ||
130 | { | 137 | { |
131 | try | 138 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); |
132 | { | ||
133 | m_scene.DeleteToInventory(x.destination, | ||
134 | x.folderID, x.objectGroup, x.remoteClient, | ||
135 | x.permissionToDelete); | ||
136 | } | ||
137 | catch (Exception e) | ||
138 | { | ||
139 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); | ||
140 | } | ||
141 | } | 139 | } |
142 | 140 | ||
143 | return true; | 141 | return true; |