diff options
author | Melanie Thielker | 2014-07-29 05:53:40 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-07-29 05:53:40 +0200 |
commit | ec5f96b272d6a8bbde4d44657e5868f09e33d2e1 (patch) | |
tree | 03cf044a695218f48a7b5166d66a52c6173808ed /OpenSim | |
parent | Correct nomenclature for LLSD messages. LL sure suck (diff) | |
download | opensim-SC-ec5f96b272d6a8bbde4d44657e5868f09e33d2e1.zip opensim-SC-ec5f96b272d6a8bbde4d44657e5868f09e33d2e1.tar.gz opensim-SC-ec5f96b272d6a8bbde4d44657e5868f09e33d2e1.tar.bz2 opensim-SC-ec5f96b272d6a8bbde4d44657e5868f09e33d2e1.tar.xz |
Persist new land fields for access control
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 1b3e81e..f743663 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -706,7 +706,8 @@ namespace OpenSim.Data.MySQL | |||
706 | "UserLocationX, UserLocationY, UserLocationZ, " + | 706 | "UserLocationX, UserLocationY, UserLocationZ, " + |
707 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + | 707 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + |
708 | "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + | 708 | "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + |
709 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + | 709 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia, " + |
710 | "SeeAVs, AnyAVSounds, GroupAVSounds) values (" + | ||
710 | "?UUID, ?RegionUUID, " + | 711 | "?UUID, ?RegionUUID, " + |
711 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + | 712 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + |
712 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + | 713 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + |
@@ -717,7 +718,8 @@ namespace OpenSim.Data.MySQL | |||
717 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + | 718 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + |
718 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 719 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
719 | "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ | 720 | "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ |
720 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; | 721 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia, " + |
722 | "?SeeAVs, ?AnyAVSounds, ?GroupAVSounds)"; | ||
721 | 723 | ||
722 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); | 724 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
723 | 725 | ||
@@ -1544,6 +1546,13 @@ namespace OpenSim.Data.MySQL | |||
1544 | 1546 | ||
1545 | newData.ParcelAccessList = new List<LandAccessEntry>(); | 1547 | newData.ParcelAccessList = new List<LandAccessEntry>(); |
1546 | 1548 | ||
1549 | if (!(row["SeeAVs"] is System.DBNull)) | ||
1550 | newData.SeeAVs = Convert.ToInt32(row["SeeAVs"]) != 0 ? true : false; | ||
1551 | if (!(row["AnyAVSounds"] is System.DBNull)) | ||
1552 | newData.AnyAVSounds = Convert.ToInt32(row["AnyAVSounds"]) != 0 ? true : false; | ||
1553 | if (!(row["GroupAVSounds"] is System.DBNull)) | ||
1554 | newData.GroupAVSounds = Convert.ToInt32(row["GroupAVSounds"]) != 0 ? true : false; | ||
1555 | |||
1547 | return newData; | 1556 | return newData; |
1548 | } | 1557 | } |
1549 | 1558 | ||
@@ -1893,6 +1902,9 @@ namespace OpenSim.Data.MySQL | |||
1893 | cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop); | 1902 | cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop); |
1894 | cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic); | 1903 | cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic); |
1895 | cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia); | 1904 | cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia); |
1905 | cmd.Parameters.AddWithValue("SeeAVs", land.SeeAVs ? 1 : 0); | ||
1906 | cmd.Parameters.AddWithValue("AnyAVSounds", land.AnyAVSounds ? 1 : 0); | ||
1907 | cmd.Parameters.AddWithValue("GroupAVSounds", land.GroupAVSounds ? 1 : 0); | ||
1896 | 1908 | ||
1897 | } | 1909 | } |
1898 | 1910 | ||