ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

- cleaning up LandData/ILandObject capitalization issues

Browse Source 
- adding LandDataSerializer to OAR mechanics
This commit is contained in:
dr scofield (aka dirk husemann)
2009-10-02 11:10:52 +02:00
parent a2cdbd784d
commit 2107b67f1b
24 changed files with 429 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@@ -624,7 +624,7 @@ ELSE
//As the delete landaccess is already in the mysql code
//Delete old values
RemoveLandObject(parcel.landData.GlobalID);
RemoveLandObject(parcel.LandData.GlobalID);
//Insert new values
string sql = @"INSERT INTO [land]
@@ -634,7 +634,7 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{
cmd.Parameters.AddRange(CreateLandParameters(parcel.landData, parcel.regionUUID));
cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
cmd.ExecuteNonQuery();
}
@@ -643,9 +643,9 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{
foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.landData.ParcelAccessList)
foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
{
cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.regionUUID));
cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();

6
OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
View File

@@ -685,7 +685,7 @@ namespace OpenSim.Data.MySQL
"?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
"?AuthbuyerID, ?OtherCleanTime, ?Dwell)";
FillLandCommand(cmd, parcel.landData, parcel.regionUUID);
FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
ExecuteNonQuery(cmd);
@@ -700,9 +700,9 @@ namespace OpenSim.Data.MySQL
"?Flags)";
foreach (ParcelManager.ParcelAccessEntry entry in
parcel.landData.ParcelAccessList)
parcel.LandData.ParcelAccessList)
{
FillLandAccessCommand(cmd, entry, parcel.landData.GlobalID);
FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID);
ExecuteNonQuery(cmd);
cmd.Parameters.Clear();
}

12
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@@ -638,29 +638,29 @@ namespace OpenSim.Data.SQLite
DataTable land = ds.Tables["land"];
DataTable landaccesslist = ds.Tables["landaccesslist"];
DataRow landRow = land.Rows.Find(parcel.landData.GlobalID.ToString());
DataRow landRow = land.Rows.Find(parcel.LandData.GlobalID.ToString());
if (landRow == null)
{
landRow = land.NewRow();
fillLandRow(landRow, parcel.landData, parcel.regionUUID);
fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
land.Rows.Add(landRow);
}
else
{
fillLandRow(landRow, parcel.landData, parcel.regionUUID);
fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
}
// I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.landData.GlobalID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
cmd.ExecuteNonQuery();
}
foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.ParcelAccessList)
foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
{
DataRow newAccessRow = landaccesslist.NewRow();
fillLandAccessRow(newAccessRow, entry, parcel.landData.GlobalID);
fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID);
landaccesslist.Rows.Add(newAccessRow);
}
}