diff options
author | Kunnis | 2009-08-16 18:54:20 -0500 |
---|---|---|
committer | Melanie | 2009-08-19 23:45:22 +0100 |
commit | f1287cc7af7da26910c5cba456a8c35b6454d815 (patch) | |
tree | c02fccc67728d57b5097a3ba643bb8ed6987ee8c /OpenSim/Services | |
parent | Fixes GetRootFolder for normal standalone, which was being incorrectly redire... (diff) | |
download | opensim-SC-f1287cc7af7da26910c5cba456a8c35b6454d815.zip opensim-SC-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.gz opensim-SC-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.bz2 opensim-SC-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.xz |
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index fe663eb..88a905c 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Services.AssetService | |||
83 | if (!UUID.TryParse(id, out assetID)) | 83 | if (!UUID.TryParse(id, out assetID)) |
84 | return null; | 84 | return null; |
85 | 85 | ||
86 | return m_Database.FetchAsset(assetID); | 86 | return m_Database.GetAsset(assetID); |
87 | } | 87 | } |
88 | 88 | ||
89 | public AssetMetadata GetMetadata(string id) | 89 | public AssetMetadata GetMetadata(string id) |
@@ -93,7 +93,7 @@ namespace OpenSim.Services.AssetService | |||
93 | if (!UUID.TryParse(id, out assetID)) | 93 | if (!UUID.TryParse(id, out assetID)) |
94 | return null; | 94 | return null; |
95 | 95 | ||
96 | AssetBase asset = m_Database.FetchAsset(assetID); | 96 | AssetBase asset = m_Database.GetAsset(assetID); |
97 | return asset.Metadata; | 97 | return asset.Metadata; |
98 | } | 98 | } |
99 | 99 | ||
@@ -104,7 +104,7 @@ namespace OpenSim.Services.AssetService | |||
104 | if (!UUID.TryParse(id, out assetID)) | 104 | if (!UUID.TryParse(id, out assetID)) |
105 | return null; | 105 | return null; |
106 | 106 | ||
107 | AssetBase asset = m_Database.FetchAsset(assetID); | 107 | AssetBase asset = m_Database.GetAsset(assetID); |
108 | return asset.Data; | 108 | return asset.Data; |
109 | } | 109 | } |
110 | 110 | ||
@@ -117,7 +117,7 @@ namespace OpenSim.Services.AssetService | |||
117 | if (!UUID.TryParse(id, out assetID)) | 117 | if (!UUID.TryParse(id, out assetID)) |
118 | return false; | 118 | return false; |
119 | 119 | ||
120 | AssetBase asset = m_Database.FetchAsset(assetID); | 120 | AssetBase asset = m_Database.GetAsset(assetID); |
121 | 121 | ||
122 | //m_log.DebugFormat("[AssetService]: Got asset {0}", asset); | 122 | //m_log.DebugFormat("[AssetService]: Got asset {0}", asset); |
123 | 123 | ||
@@ -129,7 +129,7 @@ namespace OpenSim.Services.AssetService | |||
129 | public string Store(AssetBase asset) | 129 | public string Store(AssetBase asset) |
130 | { | 130 | { |
131 | //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID); | 131 | //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID); |
132 | m_Database.CreateAsset(asset); | 132 | m_Database.StoreAsset(asset); |
133 | 133 | ||
134 | return asset.ID; | 134 | return asset.ID; |
135 | } | 135 | } |