diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLegacyRegionData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 37d7a88..04446ce 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -677,7 +677,8 @@ 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) values (" + | 680 | "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " + |
681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + | ||
681 | "?UUID, ?RegionUUID, " + | 682 | "?UUID, ?RegionUUID, " + |
682 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + | 683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + |
683 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + | 684 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + |
@@ -687,7 +688,8 @@ namespace OpenSim.Data.MySQL | |||
687 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + | 688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + |
688 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + | 689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + |
689 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
690 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; | 691 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+ |
692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; | ||
691 | 693 | ||
692 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); | 694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
693 | 695 | ||
@@ -1347,6 +1349,14 @@ namespace OpenSim.Data.MySQL | |||
1347 | m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); | 1349 | m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); |
1348 | } | 1350 | } |
1349 | 1351 | ||
1352 | newData.MediaDescription = (string) row["MediaDescription"]; | ||
1353 | newData.MediaType = (string) row["MediaType"]; | ||
1354 | newData.MediaWidth = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[0]); | ||
1355 | newData.MediaHeight = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[1]); | ||
1356 | newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); | ||
1357 | newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); | ||
1358 | newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); | ||
1359 | |||
1350 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 1360 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); |
1351 | 1361 | ||
1352 | return newData; | 1362 | return newData; |
@@ -1651,6 +1661,14 @@ namespace OpenSim.Data.MySQL | |||
1651 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); | 1661 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); |
1652 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); | 1662 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); |
1653 | cmd.Parameters.AddWithValue("Dwell", land.Dwell); | 1663 | cmd.Parameters.AddWithValue("Dwell", land.Dwell); |
1664 | cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); | ||
1665 | cmd.Parameters.AddWithValue("MediaType", land.MediaType); | ||
1666 | cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); | ||
1667 | cmd.Parameters.AddWithValue("MediaHeight", land.MediaHeight); | ||
1668 | cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop); | ||
1669 | cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic); | ||
1670 | cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia); | ||
1671 | |||
1654 | } | 1672 | } |
1655 | 1673 | ||
1656 | /// <summary> | 1674 | /// <summary> |