diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs | 3 |
4 files changed, 4 insertions, 14 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 | } |
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); |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 8432e74..88699a7 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -1111,7 +1111,6 @@ namespace OpenSim.Data.SQLite | |||
1111 | createCol(land, "UserLookAtZ", typeof (Double)); | 1111 | createCol(land, "UserLookAtZ", typeof (Double)); |
1112 | createCol(land, "AuthbuyerID", typeof(String)); | 1112 | createCol(land, "AuthbuyerID", typeof(String)); |
1113 | createCol(land, "OtherCleanTime", typeof(Int32)); | 1113 | createCol(land, "OtherCleanTime", typeof(Int32)); |
1114 | createCol(land, "Dwell", typeof(Int32)); | ||
1115 | 1114 | ||
1116 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; | 1115 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; |
1117 | 1116 | ||
@@ -1449,7 +1448,6 @@ namespace OpenSim.Data.SQLite | |||
1449 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 1448 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
1450 | 1449 | ||
1451 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1450 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1452 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1453 | 1451 | ||
1454 | return newData; | 1452 | return newData; |
1455 | } | 1453 | } |
@@ -1761,7 +1759,6 @@ namespace OpenSim.Data.SQLite | |||
1761 | row["UserLookAtZ"] = land.UserLookAt.Z; | 1759 | row["UserLookAtZ"] = land.UserLookAt.Z; |
1762 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 1760 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
1763 | row["OtherCleanTime"] = land.OtherCleanTime; | 1761 | row["OtherCleanTime"] = land.OtherCleanTime; |
1764 | row["Dwell"] = land.Dwell; | ||
1765 | row["MediaType"] = land.MediaType; | 1762 | row["MediaType"] = land.MediaType; |
1766 | row["MediaDescription"] = land.MediaDescription; | 1763 | row["MediaDescription"] = land.MediaDescription; |
1767 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); | 1764 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); |
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs index 289fd94..b5ce4c0 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs | |||
@@ -1069,7 +1069,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1069 | createCol(land, "UserLookAtZ", typeof (Double)); | 1069 | createCol(land, "UserLookAtZ", typeof (Double)); |
1070 | createCol(land, "AuthbuyerID", typeof(String)); | 1070 | createCol(land, "AuthbuyerID", typeof(String)); |
1071 | createCol(land, "OtherCleanTime", typeof(Int32)); | 1071 | createCol(land, "OtherCleanTime", typeof(Int32)); |
1072 | createCol(land, "Dwell", typeof(Int32)); | ||
1073 | 1072 | ||
1074 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; | 1073 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; |
1075 | 1074 | ||
@@ -1400,7 +1399,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1400 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 1399 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
1401 | 1400 | ||
1402 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1401 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1403 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1404 | 1402 | ||
1405 | return newData; | 1403 | return newData; |
1406 | } | 1404 | } |
@@ -1711,7 +1709,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1711 | row["UserLookAtZ"] = land.UserLookAt.Z; | 1709 | row["UserLookAtZ"] = land.UserLookAt.Z; |
1712 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 1710 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
1713 | row["OtherCleanTime"] = land.OtherCleanTime; | 1711 | row["OtherCleanTime"] = land.OtherCleanTime; |
1714 | row["Dwell"] = land.Dwell; | ||
1715 | } | 1712 | } |
1716 | 1713 | ||
1717 | /// <summary> | 1714 | /// <summary> |