aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAssetData.cs
diff options
context:
space:
mode:
authorKunnis2009-08-15 10:54:48 -0500
committerTeravus Ovares (Dan Olivares)2009-08-16 14:17:29 -0400
commitd2e5380cb2325ad42917c528c52a8ad42ec0176f (patch)
tree614ef74c8083db2afb1384b2acba0108e493b6c7 /OpenSim/Data/SQLite/SQLiteAssetData.cs
parent* Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row d... (diff)
downloadopensim-SC_OLD-d2e5380cb2325ad42917c528c52a8ad42ec0176f.zip
opensim-SC_OLD-d2e5380cb2325ad42917c528c52a8ad42ec0176f.tar.gz
opensim-SC_OLD-d2e5380cb2325ad42917c528c52a8ad42ec0176f.tar.bz2
opensim-SC_OLD-d2e5380cb2325ad42917c528c52a8ad42ec0176f.tar.xz
* Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. * Improved the BasicAssetTest.cs to do full create/update/get testing * Improved the BasicInventoryTest.cs to do full create/update/get of both a folder and an item * Moved the null ref tests to the start of the PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null item
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index b09c1c9..72af7a0 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Data.SQLite
183 int assetLength = (asset.Data != null) ? asset.Data.Length : 0; 183 int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
184 184
185 m_log.Info("[ASSET DB]: " + 185 m_log.Info("[ASSET DB]: " +
186 string.Format("Loaded {6} {5} Asset: [{0}][{3}] \"{1}\":{2} ({7} bytes)", 186 string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
187 asset.FullID, asset.Name, asset.Description, asset.Type, 187 asset.FullID, asset.Name, asset.Description, asset.Type,
188 temporary, local, assetLength)); 188 temporary, local, assetLength));
189 } 189 }