aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-03-11 00:22:56 +0000
committerSean Dague2008-03-11 00:22:56 +0000
commite128819b20928d6737c7dea44ed9b1fb344d1b01 (patch)
tree012e9e1a588e74df63fa7b5789629257105398a8
parent* Added Linear Acceleration reporting to the ODEPlugin. (diff)
downloadopensim-SC_OLD-e128819b20928d6737c7dea44ed9b1fb344d1b01.zip
opensim-SC_OLD-e128819b20928d6737c7dea44ed9b1fb344d1b01.tar.gz
opensim-SC_OLD-e128819b20928d6737c7dea44ed9b1fb344d1b01.tar.bz2
opensim-SC_OLD-e128819b20928d6737c7dea44ed9b1fb344d1b01.tar.xz
this fixes up the exponentially growing startup times caused
by not deleting the landaccesslist. If this triggers an sqlite error on .NET, we'll need to track that down seperatly.
-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 b724337..e70a971 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Data.SQLite
49 private const string itemsSelect = "select * from primitems"; 49 private const string itemsSelect = "select * from primitems";
50 private const string terrainSelect = "select * from terrain limit 1"; 50 private const string terrainSelect = "select * from terrain limit 1";
51 private const string landSelect = "select * from land"; 51 private const string landSelect = "select * from land";
52 private const string landAccessListSelect = "select * from landaccesslist"; 52 private const string landAccessListSelect = "select distinct * from landaccesslist";
53 53
54 private DataSet ds; 54 private DataSet ds;
55 private SqliteDataAdapter primDa; 55 private SqliteDataAdapter primDa;
@@ -496,14 +496,13 @@ namespace OpenSim.Framework.Data.SQLite
496 { 496 {
497 fillLandRow(landRow, parcel.landData, regionUUID); 497 fillLandRow(landRow, parcel.landData, regionUUID);
498 } 498 }
499 //m_conn.Open(); 499
500 //using ( 500 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
501 //SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn)) 501 using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
502 //{ 502 {
503 //cmd.Parameters.Add(new SqliteParameter(":LandUUID", Util.ToRawUuidString(parcel.landData.globalID))); 503 cmd.Parameters.Add(new SqliteParameter(":LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
504 //cmd.ExecuteNonQuery(); 504 cmd.ExecuteNonQuery();
505 //} 505 }
506 //m_conn.Close();
507 506
508 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList) 507 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
509 { 508 {