aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAssetData.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-01 13:27:40 +0000
committerJustin Clarke Casey2008-05-01 13:27:40 +0000
commitd72bdf432a622f237b3030c1da9d1bccca20f83c (patch)
tree80b72df740a2858ac9ca8c3707ef45ff81488f67 /OpenSim/Data/SQLite/SQLiteAssetData.cs
parent* Change mysql inventory items table version 3 upgrade sql to provide explici... (diff)
downloadopensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.zip
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.gz
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.bz2
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.xz
* Align new fields upgrade sql to have the same 'not null' and default settings as when an inventoryitems table is newly created
* Normalize logging titles in database code, though this doesn't yet cover invoking code
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 0d8b468..db4848a 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -92,10 +92,10 @@ namespace OpenSim.Data.SQLite
92 92
93 override public void CreateAsset(AssetBase asset) 93 override public void CreateAsset(AssetBase asset)
94 { 94 {
95 m_log.Info("[SQLITE]: Creating Asset " + Util.ToRawUuidString(asset.FullID)); 95 m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.FullID));
96 if (ExistsAsset(asset.FullID)) 96 if (ExistsAsset(asset.FullID))
97 { 97 {
98 m_log.Info("[SQLITE]: Asset exists already, ignoring."); 98 m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
99 } 99 }
100 else 100 else
101 { 101 {
@@ -142,7 +142,7 @@ namespace OpenSim.Data.SQLite
142 142
143 int assetLength = (asset.Data != null) ? asset.Data.Length : 0; 143 int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
144 144
145 m_log.Info("[SQLITE]: " + 145 m_log.Info("[ASSET DB]: " +
146 string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)", 146 string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
147 asset.FullID, asset.Name, asset.Description, asset.Type, 147 asset.FullID, asset.Name, asset.Description, asset.Type,
148 asset.InvType, temporary, local, assetLength)); 148 asset.InvType, temporary, local, assetLength));
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
181 181
182 override public void CommitAssets() // force a sync to the database 182 override public void CommitAssets() // force a sync to the database
183 { 183 {
184 m_log.Info("[SQLITE]: Attempting commit"); 184 m_log.Info("[ASSET DB]: Attempting commit");
185 // lock (ds) 185 // lock (ds)
186 // { 186 // {
187 // da.Update(ds, "assets"); 187 // da.Update(ds, "assets");
@@ -268,7 +268,7 @@ namespace OpenSim.Data.SQLite
268 } 268 }
269 catch (SqliteSyntaxException) 269 catch (SqliteSyntaxException)
270 { 270 {
271 m_log.Info("[SQLITE]: SQLite Database doesn't exist... creating"); 271 m_log.Info("[ASSET DB]: SQLite Database doesn't exist... creating");
272 InitDB(conn); 272 InitDB(conn);
273 } 273 }
274 return true; 274 return true;