diff options
author | Melanie | 2009-10-02 19:03:22 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 19:03:22 +0100 |
commit | ce8974539e2de92e0a16a49ae560ecf5aac5e7d3 (patch) | |
tree | a8f426b248dd22581c05f786498d6347b62f5825 /OpenSim/Data/MySQL | |
parent | Merge branch 'diva-textures-osgrid' into diva-textures (diff) | |
parent | Added a default for grid services in standalone. (diff) | |
download | opensim-SC-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.zip opensim-SC-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.gz opensim-SC-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.bz2 opensim-SC-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.xz |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index c2dd788..f25bfd7 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -685,7 +685,7 @@ namespace OpenSim.Data.MySQL | |||
685 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 685 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
686 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; | 686 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; |
687 | 687 | ||
688 | FillLandCommand(cmd, parcel.landData, parcel.regionUUID); | 688 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
689 | 689 | ||
690 | ExecuteNonQuery(cmd); | 690 | ExecuteNonQuery(cmd); |
691 | 691 | ||
@@ -700,9 +700,9 @@ namespace OpenSim.Data.MySQL | |||
700 | "?Flags)"; | 700 | "?Flags)"; |
701 | 701 | ||
702 | foreach (ParcelManager.ParcelAccessEntry entry in | 702 | foreach (ParcelManager.ParcelAccessEntry entry in |
703 | parcel.landData.ParcelAccessList) | 703 | parcel.LandData.ParcelAccessList) |
704 | { | 704 | { |
705 | FillLandAccessCommand(cmd, entry, parcel.landData.GlobalID); | 705 | FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID); |
706 | ExecuteNonQuery(cmd); | 706 | ExecuteNonQuery(cmd); |
707 | cmd.Parameters.Clear(); | 707 | cmd.Parameters.Clear(); |
708 | } | 708 | } |