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.MySQL | |
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 'OpenSim/Framework/Data.MySQL')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 7 |
1 files changed, 3 insertions, 4 deletions
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; | |||
34 | using MySql.Data.MySqlClient; | 34 | using MySql.Data.MySqlClient; |
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.MySQL | 39 | namespace 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 ( |