diff options
author | mingchen | 2008-03-22 23:10:22 +0000 |
---|---|---|
committer | mingchen | 2008-03-22 23:10:22 +0000 |
commit | 71ca162821ac0e5aae5f91c433b91549ae6d5419 (patch) | |
tree | fa2f13c2541075aba6807fcf95364466a785bd51 /OpenSim/Framework/Data.SQLite | |
parent | Implements llLoopSound(), llStopSound(), and llAdjustSoundVolume(). (diff) | |
download | opensim-SC-71ca162821ac0e5aae5f91c433b91549ae6d5419.zip opensim-SC-71ca162821ac0e5aae5f91c433b91549ae6d5419.tar.gz opensim-SC-71ca162821ac0e5aae5f91c433b91549ae6d5419.tar.bz2 opensim-SC-71ca162821ac0e5aae5f91c433b91549ae6d5419.tar.xz |
*Moved LandManagement into its own region module (spiffy!)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | 7 |
1 files changed, 3 insertions, 4 deletions
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; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
37 | using OpenSim.Region.Environment.LandManagement; | ||
38 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
39 | 38 | ||
40 | namespace OpenSim.Framework.Data.SQLite | 39 | namespace 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 |