diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 23 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 14 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 10 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/Tests/EstateTests.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 4 |
8 files changed, 50 insertions, 21 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 7d017a6..7ff8737 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL | |||
89 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); | 89 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); |
90 | SceneObjectGroup grp = null; | 90 | SceneObjectGroup grp = null; |
91 | 91 | ||
92 | |||
93 | string sql = "SELECT *, " + | 92 | string sql = "SELECT *, " + |
94 | "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " + | 93 | "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " + |
95 | "FROM prims " + | 94 | "FROM prims " + |
@@ -232,7 +231,7 @@ namespace OpenSim.Data.MSSQL | |||
232 | /// <param name="regionUUID"></param> | 231 | /// <param name="regionUUID"></param> |
233 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) | 232 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) |
234 | { | 233 | { |
235 | _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); | 234 | _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); |
236 | 235 | ||
237 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 236 | using (SqlConnection conn = new SqlConnection(m_connectionString)) |
238 | { | 237 | { |
@@ -291,7 +290,6 @@ namespace OpenSim.Data.MSSQL | |||
291 | } | 290 | } |
292 | } | 291 | } |
293 | } | 292 | } |
294 | |||
295 | } | 293 | } |
296 | 294 | ||
297 | /// <summary> | 295 | /// <summary> |
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 1edcb5d..04446ce 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -239,6 +239,7 @@ namespace OpenSim.Data.MySQL | |||
239 | 239 | ||
240 | ExecuteNonQuery(cmd); | 240 | ExecuteNonQuery(cmd); |
241 | } | 241 | } |
242 | |||
242 | cmd.Dispose(); | 243 | cmd.Dispose(); |
243 | } | 244 | } |
244 | } | 245 | } |
@@ -676,7 +677,8 @@ namespace OpenSim.Data.MySQL | |||
676 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + | 677 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + |
677 | "UserLocationX, UserLocationY, UserLocationZ, " + | 678 | "UserLocationX, UserLocationY, UserLocationZ, " + |
678 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + | 679 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + |
679 | "AuthbuyerID, OtherCleanTime, Dwell) values (" + | 680 | "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " + |
681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + | ||
680 | "?UUID, ?RegionUUID, " + | 682 | "?UUID, ?RegionUUID, " + |
681 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + | 683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + |
682 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + | 684 | "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + |
@@ -686,7 +688,8 @@ namespace OpenSim.Data.MySQL | |||
686 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + | 688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + |
687 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + | 689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + |
688 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
689 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; | 691 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+ |
692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; | ||
690 | 693 | ||
691 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); | 694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
692 | 695 | ||
@@ -1346,6 +1349,14 @@ namespace OpenSim.Data.MySQL | |||
1346 | 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); |
1347 | } | 1350 | } |
1348 | 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 | |||
1349 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 1360 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); |
1350 | 1361 | ||
1351 | return newData; | 1362 | return newData; |
@@ -1650,6 +1661,14 @@ namespace OpenSim.Data.MySQL | |||
1650 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); | 1661 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); |
1651 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); | 1662 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); |
1652 | 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 | |||
1653 | } | 1672 | } |
1654 | 1673 | ||
1655 | /// <summary> | 1674 | /// <summary> |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index ce99ce4..5c32209 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -801,9 +801,19 @@ ALTER TABLE `regionwindlight` CHANGE COLUMN `cloud_scroll_x` `cloud_scroll_x` F | |||
801 | COMMIT; | 801 | COMMIT; |
802 | 802 | ||
803 | :VERSION 35 #--------------------- | 803 | :VERSION 35 #--------------------- |
804 | -- Added post 0.7 | ||
805 | 804 | ||
806 | BEGIN; | 805 | BEGIN; |
807 | ALTER TABLE prims ADD COLUMN MediaURL varchar(255); | 806 | ALTER TABLE prims ADD COLUMN MediaURL varchar(255); |
808 | ALTER TABLE primshapes ADD COLUMN Media TEXT; | 807 | ALTER TABLE primshapes ADD COLUMN Media TEXT; |
809 | COMMIT; \ No newline at end of file | 808 | COMMIT; |
809 | |||
810 | :VERSION 36 #--------------------- | ||
811 | |||
812 | BEGIN; | ||
813 | ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none' ; | ||
814 | ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT ''; | ||
815 | ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0'; | ||
816 | ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE; | ||
817 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; | ||
818 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; | ||
819 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index c461bf0..0c421ec 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -446,3 +446,13 @@ update land | |||
446 | where AuthbuyerID not like '%-%'; | 446 | where AuthbuyerID not like '%-%'; |
447 | 447 | ||
448 | COMMIT; | 448 | COMMIT; |
449 | |||
450 | :VERSION 19 | ||
451 | BEGIN ; | ||
452 | ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none' ; | ||
453 | ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT ''; | ||
454 | ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0'; | ||
455 | ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE; | ||
456 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; | ||
457 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; | ||
458 | COMMIT ; \ No newline at end of file | ||
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 4208050..8432e74 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -1762,6 +1762,12 @@ namespace OpenSim.Data.SQLite | |||
1762 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 1762 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
1763 | row["OtherCleanTime"] = land.OtherCleanTime; | 1763 | row["OtherCleanTime"] = land.OtherCleanTime; |
1764 | row["Dwell"] = land.Dwell; | 1764 | row["Dwell"] = land.Dwell; |
1765 | row["MediaType"] = land.MediaType; | ||
1766 | row["MediaDescription"] = land.MediaDescription; | ||
1767 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); | ||
1768 | row["MediaLoop"] = land.MediaLoop.ToString(); | ||
1769 | row["ObscureMusic"] = land.ObscureMusic.ToString(); | ||
1770 | row["ObscureMedia"] = land.ObscureMedia.ToString(); | ||
1765 | } | 1771 | } |
1766 | 1772 | ||
1767 | /// <summary> | 1773 | /// <summary> |
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs index d6eed3d..fbf8ba6 100644 --- a/OpenSim/Data/Tests/EstateTests.cs +++ b/OpenSim/Data/Tests/EstateTests.cs | |||
@@ -37,11 +37,6 @@ using log4net; | |||
37 | using System.Reflection; | 37 | using System.Reflection; |
38 | using System.Data.Common; | 38 | using System.Data.Common; |
39 | 39 | ||
40 | #if !NUNIT25 | ||
41 | using NUnit.Framework.SyntaxHelpers; | ||
42 | #endif | ||
43 | |||
44 | |||
45 | // DBMS-specific: | 40 | // DBMS-specific: |
46 | using MySql.Data.MySqlClient; | 41 | using MySql.Data.MySqlClient; |
47 | using OpenSim.Data.MySQL; | 42 | using OpenSim.Data.MySQL; |
@@ -52,7 +47,6 @@ using OpenSim.Data.MSSQL; | |||
52 | using Mono.Data.Sqlite; | 47 | using Mono.Data.Sqlite; |
53 | using OpenSim.Data.SQLite; | 48 | using OpenSim.Data.SQLite; |
54 | 49 | ||
55 | |||
56 | namespace OpenSim.Data.Tests | 50 | namespace OpenSim.Data.Tests |
57 | { | 51 | { |
58 | 52 | ||
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index c22e26c..3205bfa 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
@@ -37,10 +37,6 @@ using log4net; | |||
37 | using System.Reflection; | 37 | using System.Reflection; |
38 | using System.Data.Common; | 38 | using System.Data.Common; |
39 | 39 | ||
40 | #if !NUNIT25 | ||
41 | using NUnit.Framework.SyntaxHelpers; | ||
42 | #endif | ||
43 | |||
44 | // DBMS-specific: | 40 | // DBMS-specific: |
45 | using MySql.Data.MySqlClient; | 41 | using MySql.Data.MySqlClient; |
46 | using OpenSim.Data.MySQL; | 42 | using OpenSim.Data.MySQL; |
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index 3cd9e0b..29bf5a3 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
@@ -40,10 +40,6 @@ using log4net; | |||
40 | using System.Reflection; | 40 | using System.Reflection; |
41 | using System.Data.Common; | 41 | using System.Data.Common; |
42 | 42 | ||
43 | #if !NUNIT25 | ||
44 | using NUnit.Framework.SyntaxHelpers; | ||
45 | #endif | ||
46 | |||
47 | // DBMS-specific: | 43 | // DBMS-specific: |
48 | using MySql.Data.MySqlClient; | 44 | using MySql.Data.MySqlClient; |
49 | using OpenSim.Data.MySQL; | 45 | using OpenSim.Data.MySQL; |