diff options
| author | Adam Frisby | 2008-03-12 12:59:09 +0000 |
|---|---|---|
| committer | Adam Frisby | 2008-03-12 12:59:09 +0000 |
| commit | 1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f (patch) | |
| tree | 71e5f432f3ce5c1a1485b00bf1ad582664bec961 /OpenSim/Framework/Data.SQLite | |
| parent | Update svn properties. (diff) | |
| download | opensim-SC-1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f.zip opensim-SC-1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f.tar.gz opensim-SC-1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f.tar.bz2 opensim-SC-1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f.tar.xz | |
* Fix for SQLiteAssetData - We now ignore duplicate assets. We shouldn't support replacing a asset with a fixed UUID as this leads to potential collisions and revisioning issues when proxying down the road.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs index 2ca49b5..cf49386 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | |||
| @@ -91,8 +91,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
| 91 | m_log.Info("[SQLITE]: Creating Asset " + Util.ToRawUuidString(asset.FullID)); | 91 | m_log.Info("[SQLITE]: Creating Asset " + Util.ToRawUuidString(asset.FullID)); |
| 92 | if (ExistsAsset(asset.FullID)) | 92 | if (ExistsAsset(asset.FullID)) |
| 93 | { | 93 | { |
| 94 | m_log.Info("[SQLITE]: Asset exists, updating instead. You should fix the caller for this!"); | 94 | m_log.Info("[SQLITE]: Asset exists already, ignoring."); |
| 95 | UpdateAsset(asset); | ||
| 96 | } | 95 | } |
| 97 | else | 96 | else |
| 98 | { | 97 | { |