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.0.6.0-stable
parent
f46fcbb9d2
commit
e128819b20
|
@ -49,7 +49,7 @@ namespace OpenSim.Framework.Data.SQLite
|
||||||
private const string itemsSelect = "select * from primitems";
|
private const string itemsSelect = "select * from primitems";
|
||||||
private const string terrainSelect = "select * from terrain limit 1";
|
private const string terrainSelect = "select * from terrain limit 1";
|
||||||
private const string landSelect = "select * from land";
|
private const string landSelect = "select * from land";
|
||||||
private const string landAccessListSelect = "select * from landaccesslist";
|
private const string landAccessListSelect = "select distinct * from landaccesslist";
|
||||||
|
|
||||||
private DataSet ds;
|
private DataSet ds;
|
||||||
private SqliteDataAdapter primDa;
|
private SqliteDataAdapter primDa;
|
||||||
|
@ -496,14 +496,13 @@ namespace OpenSim.Framework.Data.SQLite
|
||||||
{
|
{
|
||||||
fillLandRow(landRow, parcel.landData, regionUUID);
|
fillLandRow(landRow, parcel.landData, regionUUID);
|
||||||
}
|
}
|
||||||
//m_conn.Open();
|
|
||||||
//using (
|
// I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
|
||||||
//SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
|
using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
|
||||||
//{
|
{
|
||||||
//cmd.Parameters.Add(new SqliteParameter(":LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
|
cmd.Parameters.Add(new SqliteParameter(":LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
|
||||||
//cmd.ExecuteNonQuery();
|
cmd.ExecuteNonQuery();
|
||||||
//}
|
}
|
||||||
//m_conn.Close();
|
|
||||||
|
|
||||||
foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
|
foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue