ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diva Canto
2009-08-19 17:36:34 -07:00
parent 6e35ddb0e9 b1853d9f26
commit a3db2936f7
24 changed files with 116 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/AssetService/AssetService.cs
View File

@@ -83,7 +83,7 @@ namespace OpenSim.Services.AssetService
if (!UUID.TryParse(id, out assetID))
return null;
return m_Database.FetchAsset(assetID);
return m_Database.GetAsset(assetID);
}
public AssetMetadata GetMetadata(string id)
@@ -93,7 +93,7 @@ namespace OpenSim.Services.AssetService
if (!UUID.TryParse(id, out assetID))
return null;
AssetBase asset = m_Database.FetchAsset(assetID);
AssetBase asset = m_Database.GetAsset(assetID);
return asset.Metadata;
}
@@ -104,7 +104,7 @@ namespace OpenSim.Services.AssetService
if (!UUID.TryParse(id, out assetID))
return null;
AssetBase asset = m_Database.FetchAsset(assetID);
AssetBase asset = m_Database.GetAsset(assetID);
return asset.Data;
}
@@ -117,7 +117,7 @@ namespace OpenSim.Services.AssetService
if (!UUID.TryParse(id, out assetID))
return false;
AssetBase asset = m_Database.FetchAsset(assetID);
AssetBase asset = m_Database.GetAsset(assetID);
//m_log.DebugFormat("[AssetService]: Got asset {0}", asset);
@@ -129,7 +129,7 @@ namespace OpenSim.Services.AssetService
public string Store(AssetBase asset)
{
//m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID);
m_Database.CreateAsset(asset);
m_Database.StoreAsset(asset);
return asset.ID;
}