diff options
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 1edaa52..e0dce8e 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
318 | TaskInventoryItem item = buildItem(row); | 318 | TaskInventoryItem item = buildItem(row); |
319 | inventory.Add(item); | 319 | inventory.Add(item); |
320 | 320 | ||
321 | m_log.InfoFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); | 321 | //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); |
322 | } | 322 | } |
323 | 323 | ||
324 | prim.RestoreInventoryItems(inventory); | 324 | prim.RestoreInventoryItems(inventory); |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs index 5d9580e..0e1d2d3 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | |||
@@ -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.InfoFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); | 353 | //m_log.DebugFormat("[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.InfoFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); | 367 | //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); |
368 | } | 368 | } |
369 | 369 | ||
370 | prim.RestoreInventoryItems(inventory); | 370 | prim.RestoreInventoryItems(inventory); |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 634abc8..3232b8e 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -283,18 +283,18 @@ namespace OpenSim.Grid.GridServer | |||
283 | TheSim.regionLocZ = 0; | 283 | TheSim.regionLocZ = 0; |
284 | TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]); | 284 | TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]); |
285 | 285 | ||
286 | // Added by daTwitch | 286 | // Added by daTwitch |
287 | // part of an initial brutish effort to provide accurate information (as per the xml region spec) | 287 | // part of an initial brutish effort to provide accurate information (as per the xml region spec) |
288 | // wrt the ownership of a given region | 288 | // wrt the ownership of a given region |
289 | // the (very bad) assumption is that this value is being read and handled inconsistently or | 289 | // the (very bad) assumption is that this value is being read and handled inconsistently or |
290 | // not at all. Current strategy is to put the code in place to support the validity of this information | 290 | // not at all. Current strategy is to put the code in place to support the validity of this information |
291 | // and to roll forward debugging any issues from that point | 291 | // and to roll forward debugging any issues from that point |
292 | // | 292 | // |
293 | // this particular section of the mod attempts to receive a value from the region's xml file by way of | 293 | // this particular section of the mod attempts to receive a value from the region's xml file by way of |
294 | // OSG1GridServices for the region's owner | 294 | // OSG1GridServices for the region's owner |
295 | // | 295 | // |
296 | TheSim.owner_uuid = (string)requestData["master_avatar_uuid"]; | 296 | TheSim.owner_uuid = (string)requestData["master_avatar_uuid"]; |
297 | // end of daTwitch's mods to this file | 297 | // end of daTwitch's mods to this file |
298 | 298 | ||
299 | try | 299 | try |
300 | { | 300 | { |