diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/AssetService/XAssetService.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Services/AssetService/XAssetService.cs')
-rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index b1e5184..9490d55 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Services.AssetService | |||
94 | public virtual AssetBase Get(string id) | 94 | public virtual AssetBase Get(string id) |
95 | { | 95 | { |
96 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); | 96 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); |
97 | 97 | ||
98 | UUID assetID; | 98 | UUID assetID; |
99 | 99 | ||
100 | if (!UUID.TryParse(id, out assetID)) | 100 | if (!UUID.TryParse(id, out assetID)) |
@@ -162,7 +162,7 @@ namespace OpenSim.Services.AssetService | |||
162 | public virtual bool Get(string id, Object sender, AssetRetrieved handler) | 162 | public virtual bool Get(string id, Object sender, AssetRetrieved handler) |
163 | { | 163 | { |
164 | //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id); | 164 | //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id); |
165 | 165 | ||
166 | UUID assetID; | 166 | UUID assetID; |
167 | 167 | ||
168 | if (!UUID.TryParse(id, out assetID)) | 168 | if (!UUID.TryParse(id, out assetID)) |
@@ -171,7 +171,7 @@ namespace OpenSim.Services.AssetService | |||
171 | AssetBase asset = Get(id); | 171 | AssetBase asset = Get(id); |
172 | 172 | ||
173 | //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset); | 173 | //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset); |
174 | 174 | ||
175 | handler(id, sender, asset); | 175 | handler(id, sender, asset); |
176 | 176 | ||
177 | return true; | 177 | return true; |
@@ -182,7 +182,7 @@ namespace OpenSim.Services.AssetService | |||
182 | UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id)); | 182 | UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id)); |
183 | return m_Database.AssetsExist(uuid); | 183 | return m_Database.AssetsExist(uuid); |
184 | } | 184 | } |
185 | 185 | ||
186 | public virtual string Store(AssetBase asset) | 186 | public virtual string Store(AssetBase asset) |
187 | { | 187 | { |
188 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; | 188 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; |
@@ -222,7 +222,7 @@ namespace OpenSim.Services.AssetService | |||
222 | 222 | ||
223 | private void MigrateFromChainedService(AssetBase asset) | 223 | private void MigrateFromChainedService(AssetBase asset) |
224 | { | 224 | { |
225 | Store(asset); | 225 | Store(asset); |
226 | m_ChainedAssetService.Delete(asset.ID); | 226 | m_ChainedAssetService.Delete(asset.ID); |
227 | } | 227 | } |
228 | } | 228 | } |