aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs7
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs7
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs7
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;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data; 36using OpenSim.Framework.Data;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.LandManagement;
39using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
40using OpenSim.Framework.Data.MSSQL; 39using OpenSim.Framework.Data.MSSQL;
41 40
@@ -429,7 +428,7 @@ namespace OpenSim.Framework.Data.MSSQL
429 } 428 }
430 } 429 }
431 430
432 public void StoreLandObject(Land parcel, LLUUID regionUUID) 431 public void StoreLandObject(ILandObject parcel)
433 { 432 {
434 // Instance.StoreLandObject(parcel, regionUUID); 433 // Instance.StoreLandObject(parcel, regionUUID);
435 434
@@ -446,12 +445,12 @@ namespace OpenSim.Framework.Data.MSSQL
446 if (landRow == null) 445 if (landRow == null)
447 { 446 {
448 landRow = land.NewRow(); 447 landRow = land.NewRow();
449 fillLandRow(landRow, parcel.landData, regionUUID); 448 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
450 land.Rows.Add(landRow); 449 land.Rows.Add(landRow);
451 } 450 }
452 else 451 else
453 { 452 {
454 fillLandRow(landRow, parcel.landData, regionUUID); 453 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
455 } 454 }
456 455
457 using ( 456 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;
34using MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.LandManagement;
38using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
39 38
40namespace OpenSim.Framework.Data.MySQL 39namespace OpenSim.Framework.Data.MySQL
@@ -416,7 +415,7 @@ namespace OpenSim.Framework.Data.MySQL
416 } 415 }
417 } 416 }
418 417
419 public void StoreLandObject(Land parcel, LLUUID regionUUID) 418 public void StoreLandObject(ILandObject parcel)
420 { 419 {
421 lock (m_dataSet) 420 lock (m_dataSet)
422 { 421 {
@@ -427,12 +426,12 @@ namespace OpenSim.Framework.Data.MySQL
427 if (landRow == null) 426 if (landRow == null)
428 { 427 {
429 landRow = land.NewRow(); 428 landRow = land.NewRow();
430 fillLandRow(landRow, parcel.landData, regionUUID); 429 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
431 land.Rows.Add(landRow); 430 land.Rows.Add(landRow);
432 } 431 }
433 else 432 else
434 { 433 {
435 fillLandRow(landRow, parcel.landData, regionUUID); 434 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
436 } 435 }
437 436
438 using ( 437 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;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.LandManagement;
38using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
39 38
40namespace OpenSim.Framework.Data.SQLite 39namespace OpenSim.Framework.Data.SQLite
@@ -477,7 +476,7 @@ namespace OpenSim.Framework.Data.SQLite
477 } 476 }
478 } 477 }
479 478
480 public void StoreLandObject(Land parcel, LLUUID regionUUID) 479 public void StoreLandObject(ILandObject parcel)
481 { 480 {
482 lock (ds) 481 lock (ds)
483 { 482 {
@@ -488,12 +487,12 @@ namespace OpenSim.Framework.Data.SQLite
488 if (landRow == null) 487 if (landRow == null)
489 { 488 {
490 landRow = land.NewRow(); 489 landRow = land.NewRow();
491 fillLandRow(landRow, parcel.landData, regionUUID); 490 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
492 land.Rows.Add(landRow); 491 land.Rows.Add(landRow);
493 } 492 }
494 else 493 else
495 { 494 {
496 fillLandRow(landRow, parcel.landData, regionUUID); 495 fillLandRow(landRow, parcel.landData, parcel.regionUUID);
497 } 496 }
498 497
499 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around 498 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around