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

author: Diva Canto 2009-08-19 17:36:34 -0700
committer: Diva Canto 2009-08-19 17:36:34 -0700
commit: a3db2936f7b9297815244d39cdb33c26d17c70e2 (patch)
tree: 6f5c6626f94f878a020412f348dcbc51aadd2312 /OpenSim/Grid/AssetInventoryServer
parent: Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ... (diff)
parent: Fixing a spot I missed in assets. Switching Grid to the new naming schema wit... (diff)
download: opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.zip
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.gz
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.bz2
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.xz
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index 0631ee7..92ac84f 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
            metadata = null;
            BackendResponse ret;
-            AssetBase asset = m_assetProvider.FetchAsset(assetID);
+            AssetBase asset = m_assetProvider.GetAsset(assetID);
            if (asset == null) ret = BackendResponse.NotFound;
            else
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
            assetData = null;
            BackendResponse ret;
-            AssetBase asset = m_assetProvider.FetchAsset(assetID);
+            AssetBase asset = m_assetProvider.GetAsset(assetID);
            if (asset == null) ret = BackendResponse.NotFound;
            else
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
        public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset)
        {
-            asset = m_assetProvider.FetchAsset(assetID);
+            asset = m_assetProvider.GetAsset(assetID);
            if (asset == null) return BackendResponse.NotFound;
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
        {
            BackendResponse ret;
-            m_assetProvider.CreateAsset(asset);
+            m_assetProvider.StoreAsset(asset);
            ret = BackendResponse.Success;
            m_server.MetricsProvider.LogAssetCreate(EXTENSION_NAME, ret, asset.FullID, asset.Data.Length, DateTime.Now);
author	Diva Canto	2009-08-19 17:36:34 -0700
committer	Diva Canto	2009-08-19 17:36:34 -0700
commit	a3db2936f7b9297815244d39cdb33c26d17c70e2 (patch)
tree	6f5c6626f94f878a020412f348dcbc51aadd2312 /OpenSim/Grid/AssetInventoryServer
parent	Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ... (diff)
parent	Fixing a spot I missed in assets. Switching Grid to the new naming schema wit... (diff)
download	opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.zip opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.gz opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.bz2 opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.xz

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs index 0631ee7..92ac84f 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
57	metadata = null;	57	metadata = null;
58	BackendResponse ret;	58	BackendResponse ret;
59		59
60	AssetBase asset = m_assetProvider.FetchAsset(assetID);	60	AssetBase asset = m_assetProvider.GetAsset(assetID);
61		61
62	if (asset == null) ret = BackendResponse.NotFound;	62	if (asset == null) ret = BackendResponse.NotFound;
63	else	63	else
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
75	assetData = null;	75	assetData = null;
76	BackendResponse ret;	76	BackendResponse ret;
77		77
78	AssetBase asset = m_assetProvider.FetchAsset(assetID);	78	AssetBase asset = m_assetProvider.GetAsset(assetID);
79		79
80	if (asset == null) ret = BackendResponse.NotFound;	80	if (asset == null) ret = BackendResponse.NotFound;
81	else	81	else
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
90		90
91	public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset)	91	public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset)
92	{	92	{
93	asset = m_assetProvider.FetchAsset(assetID);	93	asset = m_assetProvider.GetAsset(assetID);
94		94
95	if (asset == null) return BackendResponse.NotFound;	95	if (asset == null) return BackendResponse.NotFound;
96		96
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
107	{	107	{
108	BackendResponse ret;	108	BackendResponse ret;
109		109
110	m_assetProvider.CreateAsset(asset);	110	m_assetProvider.StoreAsset(asset);
111	ret = BackendResponse.Success;	111	ret = BackendResponse.Success;
112		112
113	m_server.MetricsProvider.LogAssetCreate(EXTENSION_NAME, ret, asset.FullID, asset.Data.Length, DateTime.Now);	113	m_server.MetricsProvider.LogAssetCreate(EXTENSION_NAME, ret, asset.FullID, asset.Data.Length, DateTime.Now);