diff options
| author | Diva Canto | 2010-06-29 14:25:13 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 14:25:13 -0700 |
| commit | bfff39c4c02ac05c2fb27f46658cffb10394223d (patch) | |
| tree | a47ee095c9b4e1d26ebec2ffc30dbe2ab50fbcc9 /OpenSim/Region/CoreModules | |
| parent | stop exceptions in setting and getting state from propogating since they aren... (diff) | |
| parent | Remove the override from DeletToInventory in HGInventoryAccessModule. This ma... (diff) | |
| download | opensim-SC-bfff39c4c02ac05c2fb27f46658cffb10394223d.zip opensim-SC-bfff39c4c02ac05c2fb27f46658cffb10394223d.tar.gz opensim-SC-bfff39c4c02ac05c2fb27f46658cffb10394223d.tar.bz2 opensim-SC-bfff39c4c02ac05c2fb27f46658cffb10394223d.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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); |