From 1277f68f43b5122f28f1a2b8f6f5bee9b8496e6f Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 12 Mar 2008 12:59:09 +0000 Subject: [PATCH] * 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. --- OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs index 2ca49b59bc..cf49386ff5 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs @@ -91,8 +91,7 @@ namespace OpenSim.Framework.Data.SQLite m_log.Info("[SQLITE]: Creating Asset " + Util.ToRawUuidString(asset.FullID)); if (ExistsAsset(asset.FullID)) { - m_log.Info("[SQLITE]: Asset exists, updating instead. You should fix the caller for this!"); - UpdateAsset(asset); + m_log.Info("[SQLITE]: Asset exists already, ignoring."); } else {