aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-06-29 21:51:56 +0100
committerMelanie2010-06-29 21:51:56 +0100
commit714367efb96bf1d28d85e9ee02901452a31cf7b9 (patch)
tree8ae093bf6ee8c177e0e39d03003e9e83dc3cac20 /OpenSim/Region
parentFix the XML serializationt to provide an empty script state element if (diff)
parentRemove the override from DeletToInventory in HGInventoryAccessModule. This ma... (diff)
downloadopensim-SC_OLD-714367efb96bf1d28d85e9ee02901452a31cf7b9.zip
opensim-SC_OLD-714367efb96bf1d28d85e9ee02901452a31cf7b9.tar.gz
opensim-SC_OLD-714367efb96bf1d28d85e9ee02901452a31cf7b9.tar.bz2
opensim-SC_OLD-714367efb96bf1d28d85e9ee02901452a31cf7b9.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs3
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);