diff options
author | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
---|---|---|
committer | Melanie | 2010-09-05 14:28:33 +0100 |
commit | 6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch) | |
tree | 19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Data/MySQL | |
parent | Logout the presence if client IP verification fails. (diff) | |
download | opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.zip opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.gz opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.bz2 opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.xz |
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 04446ce..30253c3 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -677,7 +677,7 @@ namespace OpenSim.Data.MySQL | |||
677 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + | 677 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + |
678 | "UserLocationX, UserLocationY, UserLocationZ, " + | 678 | "UserLocationX, UserLocationY, UserLocationZ, " + |
679 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + | 679 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + |
680 | "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " + | 680 | "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + |
681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + | 681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + |
682 | "?UUID, ?RegionUUID, " + | 682 | "?UUID, ?RegionUUID, " + |
683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + | 683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + |
@@ -688,7 +688,7 @@ namespace OpenSim.Data.MySQL | |||
688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + | 688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + |
689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + | 689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + |
690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
691 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+ | 691 | "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ |
692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; | 692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; |
693 | 693 | ||
694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); | 694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
@@ -1329,7 +1329,6 @@ namespace OpenSim.Data.MySQL | |||
1329 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); | 1329 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); |
1330 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); | 1330 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); |
1331 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1331 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1332 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1333 | 1332 | ||
1334 | newData.AuthBuyerID = authedbuyer; | 1333 | newData.AuthBuyerID = authedbuyer; |
1335 | newData.SnapshotID = snapshotID; | 1334 | newData.SnapshotID = snapshotID; |
@@ -1660,7 +1659,6 @@ namespace OpenSim.Data.MySQL | |||
1660 | cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z); | 1659 | cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z); |
1661 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); | 1660 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); |
1662 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); | 1661 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); |
1663 | cmd.Parameters.AddWithValue("Dwell", land.Dwell); | ||
1664 | cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); | 1662 | cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); |
1665 | cmd.Parameters.AddWithValue("MediaType", land.MediaType); | 1663 | cmd.Parameters.AddWithValue("MediaType", land.MediaType); |
1666 | cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); | 1664 | cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); |