diff options
author | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
commit | dd14c539af0fdfb6a489f62860b94b9c6b5282fb (patch) | |
tree | 48d1dd69f76d6ff69d5a51ecfc92cc84a642324c /OpenSim/Data | |
parent | Report exception message as well as stack trace if a region fails to register... (diff) | |
parent | Fix a casting operation to use ToString() (diff) | |
download | opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.zip opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.gz opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.bz2 opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 22 | ||||
-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 |
4 files changed, 48 insertions, 4 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> |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 1369704..1405207 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> |