diff options
| author | Diva Canto | 2010-06-29 14:21:48 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 14:21:48 -0700 |
| commit | d06b977ed1a0472fbf15da0d4d7ae68b40936fb8 (patch) | |
| tree | 5b08c8b00e665a06f920aa1c25e7952f29c76c3b /OpenSim | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-d06b977ed1a0472fbf15da0d4d7ae68b40936fb8.zip opensim-SC_OLD-d06b977ed1a0472fbf15da0d4d7ae68b40936fb8.tar.gz opensim-SC_OLD-d06b977ed1a0472fbf15da0d4d7ae68b40936fb8.tar.bz2 opensim-SC_OLD-d06b977ed1a0472fbf15da0d4d7ae68b40936fb8.tar.xz | |
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 58c396c..b0555da 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
| @@ -131,7 +131,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 131 | return ret; | 131 | return ret; |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | public override UUID DeleteToInventory(DeRezAction action, UUID folderID, | 134 | // DO NOT OVERRIDE THIS METHOD |
| 135 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, | ||
| 135 | SceneObjectGroup objectGroup, IClientAPI remoteClient) | 136 | SceneObjectGroup objectGroup, IClientAPI remoteClient) |
| 136 | { | 137 | { |
| 137 | UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient); | 138 | UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient); |