aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.SQLite
diff options
context:
space:
mode:
authorJeff Ames2008-02-10 01:57:59 +0000
committerJeff Ames2008-02-10 01:57:59 +0000
commite207284fefa60637e35405ebc87e5e151bd2eabd (patch)
tree6e9954502ea44fe8f6327cb65cfd0026c3322578 /OpenSim/Framework/Data.SQLite
parentSet svn:ignore in OpenSim/Tests. (diff)
downloadopensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.zip
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.gz
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.bz2
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.xz
Clean up logging calls using String.Format explicitly
Diffstat (limited to 'OpenSim/Framework/Data.SQLite')
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 69dc3f5..a724875 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Data.SQLite
207 207
208 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 208 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
209 { 209 {
210 m_log.Info(String.Format("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID)); 210 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
211 211
212 DataTable prims = ds.Tables["prims"]; 212 DataTable prims = ds.Tables["prims"];
213 DataTable shapes = ds.Tables["primshapes"]; 213 DataTable shapes = ds.Tables["primshapes"];
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Data.SQLite
350 /// <param name="prim"></param> 350 /// <param name="prim"></param>
351 private void LoadItems(SceneObjectPart prim) 351 private void LoadItems(SceneObjectPart prim)
352 { 352 {
353 m_log.Info(String.Format("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID)); 353 m_log.InfoFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
354 354
355 DataTable dbItems = ds.Tables["primitems"]; 355 DataTable dbItems = ds.Tables["primitems"];
356 356
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Data.SQLite
364 TaskInventoryItem item = buildItem(row); 364 TaskInventoryItem item = buildItem(row);
365 inventory.Add(item); 365 inventory.Add(item);
366 366
367 m_log.Info(String.Format("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID)); 367 m_log.InfoFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
368 } 368 }
369 369
370 prim.RestoreInventoryItems(inventory); 370 prim.RestoreInventoryItems(inventory);
@@ -1174,7 +1174,6 @@ namespace OpenSim.Framework.Data.SQLite
1174 byte[] textureEntry = (byte[]) row["Texture"]; 1174 byte[] textureEntry = (byte[]) row["Texture"];
1175 s.TextureEntry = textureEntry; 1175 s.TextureEntry = textureEntry;
1176 1176
1177
1178 s.ExtraParams = (byte[]) row["ExtraParams"]; 1177 s.ExtraParams = (byte[]) row["ExtraParams"];
1179 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); 1178 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
1180 // string texture = encoding.GetString((Byte[])row["Texture"]); 1179 // string texture = encoding.GetString((Byte[])row["Texture"]);
@@ -1267,7 +1266,7 @@ namespace OpenSim.Framework.Data.SQLite
1267 if (!persistPrimInventories) 1266 if (!persistPrimInventories)
1268 return; 1267 return;
1269 1268
1270 m_log.Info(String.Format("[DATASTORE]: Entered StorePrimInventory with prim ID {0}", primID)); 1269 m_log.InfoFormat("[DATASTORE]: Entered StorePrimInventory with prim ID {0}", primID);
1271 1270
1272 DataTable dbItems = ds.Tables["primitems"]; 1271 DataTable dbItems = ds.Tables["primitems"];
1273 1272
@@ -1280,10 +1279,10 @@ namespace OpenSim.Framework.Data.SQLite
1280 // repalce with current inventory details 1279 // repalce with current inventory details
1281 foreach (TaskInventoryItem newItem in items) 1280 foreach (TaskInventoryItem newItem in items)
1282 { 1281 {
1283// m_log.Info(String.Format( 1282// m_log.InfoFormat(
1284// "[DATASTORE]: ", 1283// "[DATASTORE]: ",
1285// "Adding item {0}, {1} to prim ID {2}", 1284// "Adding item {0}, {1} to prim ID {2}",
1286// newItem.Name, newItem.ItemID, newItem.ParentPartID)); 1285// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1287 1286
1288 DataRow newItemRow = dbItems.NewRow(); 1287 DataRow newItemRow = dbItems.NewRow();
1289 fillItemRow(newItemRow, newItem); 1288 fillItemRow(newItemRow, newItem);