aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs16
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 3831467..49275cb 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); 124 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
125 if (ExistsAsset(asset.FullID)) 125 if (ExistsAsset(asset.FullID))
126 { 126 {
127 LogAssetLoad(asset); 127 //LogAssetLoad(asset);
128 128
129 lock (this) 129 lock (this)
130 { 130 {
@@ -173,7 +173,7 @@ namespace OpenSim.Data.SQLite
173 173
174 int assetLength = (asset.Data != null) ? asset.Data.Length : 0; 174 int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
175 175
176 m_log.Info("[ASSET DB]: " + 176 m_log.Debug("[ASSET DB]: " +
177 string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)", 177 string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
178 asset.FullID, asset.Name, asset.Description, asset.Type, 178 asset.FullID, asset.Name, asset.Description, asset.Type,
179 temporary, local, assetLength)); 179 temporary, local, assetLength));
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index a3ae6ea..08af7c3 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -336,7 +336,7 @@ namespace OpenSim.Data.SQLite
336 /// <param name="regionUUID">the region UUID</param> 336 /// <param name="regionUUID">the region UUID</param>
337 public void RemoveObject(UUID obj, UUID regionUUID) 337 public void RemoveObject(UUID obj, UUID regionUUID)
338 { 338 {
339 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID); 339 // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
340 340
341 DataTable prims = ds.Tables["prims"]; 341 DataTable prims = ds.Tables["prims"];
342 DataTable shapes = ds.Tables["primshapes"]; 342 DataTable shapes = ds.Tables["primshapes"];
@@ -496,7 +496,7 @@ namespace OpenSim.Data.SQLite
496 { 496 {
497 //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); 497 //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
498 498
499 DataTable dbItems = ds.Tables["primitems"]; 499 DataTable dbItems = ds.Tables["primitems"];
500 String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); 500 String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
501 DataRow[] dbItemRows = dbItems.Select(sql); 501 DataRow[] dbItemRows = dbItems.Select(sql);
502 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); 502 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
@@ -642,29 +642,29 @@ namespace OpenSim.Data.SQLite
642 DataTable land = ds.Tables["land"]; 642 DataTable land = ds.Tables["land"];
643 DataTable landaccesslist = ds.Tables["landaccesslist"]; 643 DataTable landaccesslist = ds.Tables["landaccesslist"];
644 644
645 DataRow landRow = land.Rows.Find(parcel.landData.GlobalID.ToString()); 645 DataRow landRow = land.Rows.Find(parcel.LandData.GlobalID.ToString());
646 if (landRow == null) 646 if (landRow == null)
647 { 647 {
648 landRow = land.NewRow(); 648 landRow = land.NewRow();
649 fillLandRow(landRow, parcel.landData, parcel.regionUUID); 649 fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
650 land.Rows.Add(landRow); 650 land.Rows.Add(landRow);
651 } 651 }
652 else 652 else
653 { 653 {
654 fillLandRow(landRow, parcel.landData, parcel.regionUUID); 654 fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
655 } 655 }
656 656
657 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around 657 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
658 using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn)) 658 using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
659 { 659 {
660 cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.landData.GlobalID.ToString())); 660 cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
661 cmd.ExecuteNonQuery(); 661 cmd.ExecuteNonQuery();
662 } 662 }
663 663
664 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.ParcelAccessList) 664 foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
665 { 665 {
666 DataRow newAccessRow = landaccesslist.NewRow(); 666 DataRow newAccessRow = landaccesslist.NewRow();
667 fillLandAccessRow(newAccessRow, entry, parcel.landData.GlobalID); 667 fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID);
668 landaccesslist.Rows.Add(newAccessRow); 668 landaccesslist.Rows.Add(newAccessRow);
669 } 669 }
670 } 670 }