diff options
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index ffdaa60..0feb59d 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Services.AssetService | |||
83 | 83 | ||
84 | if (assetLoaderEnabled) | 84 | if (assetLoaderEnabled) |
85 | { | 85 | { |
86 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); | 86 | m_log.DebugFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); |
87 | 87 | ||
88 | m_AssetLoader.ForEachDefaultXmlAsset( | 88 | m_AssetLoader.ForEachDefaultXmlAsset( |
89 | loaderArgs, | 89 | loaderArgs, |
@@ -100,7 +100,7 @@ namespace OpenSim.Services.AssetService | |||
100 | }); | 100 | }); |
101 | } | 101 | } |
102 | 102 | ||
103 | m_log.Info("[ASSET SERVICE]: Local asset service enabled"); | 103 | m_log.Debug("[ASSET SERVICE]: Local asset service enabled"); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | } | 106 | } |
@@ -174,11 +174,20 @@ namespace OpenSim.Services.AssetService | |||
174 | 174 | ||
175 | public virtual string Store(AssetBase asset) | 175 | public virtual string Store(AssetBase asset) |
176 | { | 176 | { |
177 | //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID); | 177 | if (!m_Database.ExistsAsset(asset.FullID)) |
178 | if (!m_Database.StoreAsset(asset)) | ||
179 | { | 178 | { |
179 | // m_log.DebugFormat( | ||
180 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); | ||
181 | if (!m_Database.StoreAsset(asset)) | ||
182 | { | ||
180 | return UUID.Zero.ToString(); | 183 | return UUID.Zero.ToString(); |
184 | } | ||
181 | } | 185 | } |
186 | // else | ||
187 | // { | ||
188 | // m_log.DebugFormat( | ||
189 | // "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length); | ||
190 | // } | ||
182 | 191 | ||
183 | return asset.ID; | 192 | return asset.ID; |
184 | } | 193 | } |