OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Removed Unneeded Debug I added in my last revison 

*Fixed typo causing access lists not to be stored correctly in sqlite
afrisby
mingchen 2007-12-18 18:32:20 +00:00
parent 128f2b1e1b
commit 30b7c047fa
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/LandManagement/LandManager.cs
View File

@ -104,6 +104,7 @@ namespace OpenSim.Region.Environment.LandManagement
} }
#endregion #endregion
#region Member Variables #region Member Variables
public Dictionary<int, Land> landList = new Dictionary<int, Land>(); public Dictionary<int, Land> landList = new Dictionary<int, Land>();

6
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -388,7 +388,6 @@ namespace OpenSim.DataStore.MonoSqlite
SqliteConnection conn = new SqliteConnection(m_connectionString); SqliteConnection conn = new SqliteConnection(m_connectionString);
conn.Open(); conn.Open();
Console.WriteLine("REMOVING LAND WITH ID " + globalID);
using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", conn)) using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", conn))
{ {
cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString())); cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
@ -410,8 +409,6 @@ namespace OpenSim.DataStore.MonoSqlite
{ {
SqliteConnection conn = new SqliteConnection(m_connectionString); SqliteConnection conn = new SqliteConnection(m_connectionString);
conn.Open(); conn.Open();
Console.WriteLine("STORING LAND TO SQLITE: " + parcel.landData.landName + " (" + parcel.landData.globalID + ")");
DataTable land = ds.Tables["land"]; DataTable land = ds.Tables["land"];
DataTable landaccesslist = ds.Tables["landaccesslist"]; DataTable landaccesslist = ds.Tables["landaccesslist"];
@ -458,7 +455,6 @@ namespace OpenSim.DataStore.MonoSqlite
foreach (DataRow rawDataLand in rawDataForRegion) foreach (DataRow rawDataLand in rawDataForRegion)
{ {
LandData newLand = buildLandData(rawDataLand); LandData newLand = buildLandData(rawDataLand);
Console.WriteLine("LOADED NEW LAND FROM SQLITE: " + newLand.landName + " (" + newLand.globalID + ")");
string accessListSearchExp = "LandUUID = '" + newLand.globalID.ToString() + "'"; string accessListSearchExp = "LandUUID = '" + newLand.globalID.ToString() + "'";
DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp); DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp);
foreach (DataRow rawDataLandAccess in rawDataForLandAccessList) foreach (DataRow rawDataLandAccess in rawDataForLandAccessList)
@ -778,7 +774,7 @@ namespace OpenSim.DataStore.MonoSqlite
private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
{ {
ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
entry.AgentID = new LLUUID((string)row["LandUUID"]); entry.AgentID = new LLUUID((string)row["AccessUUID"]);
entry.Flags = (ParcelManager.AccessList)row["Flags"]; entry.Flags = (ParcelManager.AccessList)row["Flags"];
entry.Time = new DateTime(); entry.Time = new DateTime();
return entry; return entry;