aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
diff options
context:
space:
mode:
authorMelanie Thielker2010-09-05 14:16:42 +0200
committerMelanie2010-09-05 14:28:33 +0100
commit6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch)
tree19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Data/MSSQL
parentLogout the presence if client IP verification fails. (diff)
downloadopensim-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 'OpenSim/Data/MSSQL')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs6
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])
642VALUES 642VALUES
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 }