diff options
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLSimulationData.cs')
-rwxr-xr-x | OpenSim/Data/PGSQL/PGSQLSimulationData.cs | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs index 960e7f6..25e1a7f 100755 --- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs +++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs | |||
@@ -688,11 +688,14 @@ namespace OpenSim.Data.PGSQL | |||
688 | string sql = @"INSERT INTO land | 688 | string sql = @"INSERT INTO land |
689 | (""UUID"",""RegionUUID"",""LocalLandID"",""Bitmap"",""Name"",""Description"",""OwnerUUID"",""IsGroupOwned"",""Area"",""AuctionID"",""Category"",""ClaimDate"",""ClaimPrice"", | 689 | (""UUID"",""RegionUUID"",""LocalLandID"",""Bitmap"",""Name"",""Description"",""OwnerUUID"",""IsGroupOwned"",""Area"",""AuctionID"",""Category"",""ClaimDate"",""ClaimPrice"", |
690 | ""GroupUUID"",""SalePrice"",""LandStatus"",""LandFlags"",""LandingType"",""MediaAutoScale"",""MediaTextureUUID"",""MediaURL"",""MusicURL"",""PassHours"",""PassPrice"", | 690 | ""GroupUUID"",""SalePrice"",""LandStatus"",""LandFlags"",""LandingType"",""MediaAutoScale"",""MediaTextureUUID"",""MediaURL"",""MusicURL"",""PassHours"",""PassPrice"", |
691 | ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"") | 691 | ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"",""Dwell"", |
692 | ""MediaType"",""MediaDescription"",""MediaSize"",""MediaLoop"",""ObscureMusic"",""ObscureMedia"",""SeeAVs"",""AnyAVSounds"",""GroupAVSounds"") | ||
692 | VALUES | 693 | VALUES |
693 | (:UUID,:RegionUUID,:LocalLandID,:Bitmap,:Name,:Description,:OwnerUUID,:IsGroupOwned,:Area,:AuctionID,:Category,:ClaimDate,:ClaimPrice, | 694 | (:UUID,:RegionUUID,:LocalLandID,:Bitmap,:Name,:Description,:OwnerUUID,:IsGroupOwned,:Area,:AuctionID,:Category,:ClaimDate,:ClaimPrice, |
694 | :GroupUUID,:SalePrice,:LandStatus,:LandFlags,:LandingType,:MediaAutoScale,:MediaTextureUUID,:MediaURL,:MusicURL,:PassHours,:PassPrice, | 695 | :GroupUUID,:SalePrice,:LandStatus,:LandFlags,:LandingType,:MediaAutoScale,:MediaTextureUUID,:MediaURL,:MusicURL,:PassHours,:PassPrice, |
695 | :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime)"; | 696 | :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime,:Dwell, |
697 | :MediaType,:MediaDescription,:MediaWidth::text || ',' || :MediaHeight::text,:MediaLoop,:ObscureMusic,:ObscureMedia,:SeeAVs::int::smallint, | ||
698 | :AnyAVSounds::int::smallint,:GroupAVSounds::int::smallint)"; | ||
696 | 699 | ||
697 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) | 700 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
698 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) | 701 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
@@ -1520,6 +1523,8 @@ namespace OpenSim.Data.PGSQL | |||
1520 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); | 1523 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); |
1521 | 1524 | ||
1522 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1525 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1526 | newData.Dwell = Convert.ToSingle(row["Dwell"]); | ||
1527 | |||
1523 | 1528 | ||
1524 | try | 1529 | try |
1525 | { | 1530 | { |
@@ -1545,6 +1550,10 @@ namespace OpenSim.Data.PGSQL | |||
1545 | newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); | 1550 | newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); |
1546 | newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); | 1551 | newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); |
1547 | newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); | 1552 | newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); |
1553 | |||
1554 | newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]); | ||
1555 | newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]); | ||
1556 | newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]); | ||
1548 | 1557 | ||
1549 | return newData; | 1558 | return newData; |
1550 | } | 1559 | } |
@@ -1947,6 +1956,17 @@ namespace OpenSim.Data.PGSQL | |||
1947 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); | 1956 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); |
1948 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); | 1957 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); |
1949 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); | 1958 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); |
1959 | parameters.Add(_Database.CreateParameter("Dwell", land.Dwell)); | ||
1960 | parameters.Add(_Database.CreateParameter("MediaDescription", land.MediaDescription)); | ||
1961 | parameters.Add(_Database.CreateParameter("MediaType", land.MediaType)); | ||
1962 | parameters.Add(_Database.CreateParameter("MediaWidth", land.MediaWidth)); | ||
1963 | parameters.Add(_Database.CreateParameter("MediaHeight", land.MediaHeight)); | ||
1964 | parameters.Add(_Database.CreateParameter("MediaLoop", land.MediaLoop)); | ||
1965 | parameters.Add(_Database.CreateParameter("ObscureMusic", land.ObscureMusic)); | ||
1966 | parameters.Add(_Database.CreateParameter("ObscureMedia", land.ObscureMedia)); | ||
1967 | parameters.Add(_Database.CreateParameter("SeeAVs", land.SeeAVs)); | ||
1968 | parameters.Add(_Database.CreateParameter("AnyAVSounds", land.AnyAVSounds)); | ||
1969 | parameters.Add(_Database.CreateParameter("GroupAVSounds", land.GroupAVSounds)); | ||
1950 | 1970 | ||
1951 | return parameters.ToArray(); | 1971 | return parameters.ToArray(); |
1952 | } | 1972 | } |