diff options
| author | Melanie | 2010-10-08 23:23:07 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-08 23:23:07 +0100 |
| commit | 4a57288577dd3ec6a99f467b4a2761fe83b0b4b8 (patch) | |
| tree | 7db8cba052b744d652623f7f7f86ddcf026a225d | |
| parent | Guard against locking a nullref to avoid build break (diff) | |
| download | opensim-SC_OLD-4a57288577dd3ec6a99f467b4a2761fe83b0b4b8.zip opensim-SC_OLD-4a57288577dd3ec6a99f467b4a2761fe83b0b4b8.tar.gz opensim-SC_OLD-4a57288577dd3ec6a99f467b4a2761fe83b0b4b8.tar.bz2 opensim-SC_OLD-4a57288577dd3ec6a99f467b4a2761fe83b0b4b8.tar.xz | |
Fix an infinite recursion
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d05cfc2..7a175ea 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -208,7 +208,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | foreach (List<SceneObjectGroup> objlist in deletes.Values) | 210 | foreach (List<SceneObjectGroup> objlist in deletes.Values) |
| 211 | ret = DeleteToInventory(action, folderID, objlist, remoteClient); | 211 | { |
| 212 | foreach (SceneObjectGroup g in objlist) | ||
| 213 | ret = DeleteToInventory(action, folderID, g, remoteClient); | ||
| 214 | } | ||
| 212 | 215 | ||
| 213 | return ret; | 216 | return ret; |
| 214 | } | 217 | } |