diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index c7a259d..d40aa4b 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -174,10 +174,12 @@ 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( | 177 | if (!m_Database.ExistsAsset(asset.FullID)) |
178 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length); | 178 | { |
179 | 179 | // m_log.DebugFormat( | |
180 | m_Database.StoreAsset(asset); | 180 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); |
181 | m_Database.StoreAsset(asset); | ||
182 | } | ||
181 | 183 | ||
182 | return asset.ID; | 184 | return asset.ID; |
183 | } | 185 | } |