Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-06-29 20:36:36 +0100
committer: Melanie 2010-06-29 20:36:36 +0100
commit: 5d11833ae1969718187c23b9d29ebd233ecbb401 (patch)
tree: 3be12b67f0c1198a10c2e15afbfffa32b8a4f77f /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
parent: Fix a nullref on autoreturn (diff)
parent: stop exceptions in setting and getting state from propogating since they aren... (diff)
download: opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.zip
opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.gz
opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.bz2
opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 2ab46aa..58c396c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            return ret;
        }
-        public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
+        public override UUID DeleteToInventory(DeRezAction action, UUID folderID,
                SceneObjectGroup objectGroup, IClientAPI remoteClient)
        {
            UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);
author	Melanie	2010-06-29 20:36:36 +0100
committer	Melanie	2010-06-29 20:36:36 +0100
commit	5d11833ae1969718187c23b9d29ebd233ecbb401 (patch)
tree	3be12b67f0c1198a10c2e15afbfffa32b8a4f77f /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
parent	Fix a nullref on autoreturn (diff)
parent	stop exceptions in setting and getting state from propogating since they aren... (diff)
download	opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.zip opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.gz opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.bz2 opensim-SC_OLD-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.xz

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 2ab46aa..58c396c 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
131	return ret;	131	return ret;
132	}	132	}
133		133
134	public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,	134	public override UUID DeleteToInventory(DeRezAction action, UUID folderID,
135	SceneObjectGroup objectGroup, IClientAPI remoteClient)	135	SceneObjectGroup objectGroup, IClientAPI remoteClient)
136	{	136	{
137	UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);	137	UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);