*Moved LandManagement into its own region module (spiffy!)

3 files changed, 9 insertions, 12 deletions

diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs b/OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs
index 67ed0c0..c86cfb6 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Data.MSSQL;
 
@@ -429,7 +428,7 @@ namespace OpenSim.Framework.Data.MSSQL
             }
         }
 
-        public void StoreLandObject(Land parcel, LLUUID regionUUID)
+        public void StoreLandObject(ILandObject parcel)
         {
             // Instance.StoreLandObject(parcel, regionUUID);
 
@@ -446,12 +445,12 @@ namespace OpenSim.Framework.Data.MSSQL
                 if (landRow == null)
                 {
                     landRow = land.NewRow();
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                     land.Rows.Add(landRow);
                 }
                 else
                 {
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                 }
 
                 using (
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index f4c839e..b1ab42fd 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -34,7 +34,6 @@ using libsecondlife;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Framework.Data.MySQL
@@ -416,7 +415,7 @@ namespace OpenSim.Framework.Data.MySQL
             }
         }
 
-        public void StoreLandObject(Land parcel, LLUUID regionUUID)
+        public void StoreLandObject(ILandObject parcel)
         {
             lock (m_dataSet)
             {
@@ -427,12 +426,12 @@ namespace OpenSim.Framework.Data.MySQL
                 if (landRow == null)
                 {
                     landRow = land.NewRow();
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                     land.Rows.Add(landRow);
                 }
                 else
                 {
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                 }
 
                 using (
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index dc3d388..77161a4 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -34,7 +34,6 @@ using Mono.Data.SqliteClient;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Framework.Data.SQLite
@@ -477,7 +476,7 @@ namespace OpenSim.Framework.Data.SQLite
             }
         }
 
-        public void StoreLandObject(Land parcel, LLUUID regionUUID)
+        public void StoreLandObject(ILandObject parcel)
         {
             lock (ds)
             {
@@ -488,12 +487,12 @@ namespace OpenSim.Framework.Data.SQLite
                 if (landRow == null)
                 {
                     landRow = land.NewRow();
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                     land.Rows.Add(landRow);
                 }
                 else
                 {
-                    fillLandRow(landRow, parcel.landData, regionUUID);
+                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
                 }
 
                 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around