diff options
author | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
commit | e5936071711e35f9edf44d8393b8ad28ef4023db (patch) | |
tree | 72677e380cfcea4921eb910a93a1b985a4a4d6d1 /OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.zip opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.gz opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.bz2 opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.xz |
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 7ff8737..77b8a10 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -638,9 +638,9 @@ ELSE | |||
638 | 638 | ||
639 | //Insert new values | 639 | //Insert new values |
640 | string sql = @"INSERT INTO [land] | 640 | string sql = @"INSERT INTO [land] |
641 | ([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime],[Dwell]) | 641 | ([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime]) |
642 | VALUES | 642 | VALUES |
643 | (@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime,@Dwell)"; | 643 | (@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime)"; |
644 | 644 | ||
645 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 645 | using (SqlConnection conn = new SqlConnection(m_connectionString)) |
646 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 646 | using (SqlCommand cmd = new SqlCommand(sql, conn)) |
@@ -954,7 +954,6 @@ VALUES | |||
954 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); | 954 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); |
955 | 955 | ||
956 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 956 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
957 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
958 | 957 | ||
959 | try | 958 | try |
960 | { | 959 | { |
@@ -1357,7 +1356,6 @@ VALUES | |||
1357 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); | 1356 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); |
1358 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); | 1357 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); |
1359 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); | 1358 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); |
1360 | parameters.Add(_Database.CreateParameter("Dwell", land.Dwell)); | ||
1361 | 1359 | ||
1362 | return parameters.ToArray(); | 1360 | return parameters.ToArray(); |
1363 | } | 1361 | } |