diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index bfeae12..f17e8ae 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -222,7 +222,7 @@ namespace OpenSim.Data.MySQL | |||
222 | "PathTaperX, PathTaperY, PathTwist, " + | 222 | "PathTaperX, PathTaperY, PathTwist, " + |
223 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + | 223 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + |
224 | "ProfileCurve, ProfileHollow, Texture, " + | 224 | "ProfileCurve, ProfileHollow, Texture, " + |
225 | "ExtraParams, State) values (?UUID, " + | 225 | "ExtraParams, State, Media) values (?UUID, " + |
226 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + | 226 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + |
227 | "?PCode, ?PathBegin, ?PathEnd, " + | 227 | "?PCode, ?PathBegin, ?PathEnd, " + |
228 | "?PathScaleX, ?PathScaleY, " + | 228 | "?PathScaleX, ?PathScaleY, " + |
@@ -233,7 +233,7 @@ namespace OpenSim.Data.MySQL | |||
233 | "?PathTwistBegin, ?ProfileBegin, " + | 233 | "?PathTwistBegin, ?ProfileBegin, " + |
234 | "?ProfileEnd, ?ProfileCurve, " + | 234 | "?ProfileEnd, ?ProfileCurve, " + |
235 | "?ProfileHollow, ?Texture, ?ExtraParams, " + | 235 | "?ProfileHollow, ?Texture, ?ExtraParams, " + |
236 | "?State)"; | 236 | "?State, ?Media)"; |
237 | 237 | ||
238 | FillShapeCommand(cmd, prim); | 238 | FillShapeCommand(cmd, prim); |
239 | 239 | ||
@@ -1700,6 +1700,9 @@ namespace OpenSim.Data.MySQL | |||
1700 | s.ExtraParams = (byte[])row["ExtraParams"]; | 1700 | s.ExtraParams = (byte[])row["ExtraParams"]; |
1701 | 1701 | ||
1702 | s.State = (byte)(int)row["State"]; | 1702 | s.State = (byte)(int)row["State"]; |
1703 | |||
1704 | if (!(row["Media"] is System.DBNull)) | ||
1705 | s.MediaRaw = (string)row["Media"]; | ||
1703 | 1706 | ||
1704 | return s; | 1707 | return s; |
1705 | } | 1708 | } |
@@ -1743,6 +1746,7 @@ namespace OpenSim.Data.MySQL | |||
1743 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); | 1746 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); |
1744 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); | 1747 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); |
1745 | cmd.Parameters.AddWithValue("State", s.State); | 1748 | cmd.Parameters.AddWithValue("State", s.State); |
1749 | cmd.Parameters.AddWithValue("Media", s.MediaRaw); | ||
1746 | } | 1750 | } |
1747 | 1751 | ||
1748 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | 1752 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 3f644f9..1369704 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -1,4 +1,4 @@ | |||
1 | | 1 | |
2 | :VERSION 1 #--------------------- | 2 | :VERSION 1 #--------------------- |
3 | 3 | ||
4 | BEGIN; | 4 | BEGIN; |
@@ -800,3 +800,10 @@ BEGIN; | |||
800 | ALTER TABLE `regionwindlight` CHANGE COLUMN `cloud_scroll_x` `cloud_scroll_x` FLOAT(4,2) NOT NULL DEFAULT '0.20' AFTER `cloud_detail_density`, CHANGE COLUMN `cloud_scroll_y` `cloud_scroll_y` FLOAT(4,2) NOT NULL DEFAULT '0.01' AFTER `cloud_scroll_x_lock`; | 800 | ALTER TABLE `regionwindlight` CHANGE COLUMN `cloud_scroll_x` `cloud_scroll_x` FLOAT(4,2) NOT NULL DEFAULT '0.20' AFTER `cloud_detail_density`, CHANGE COLUMN `cloud_scroll_y` `cloud_scroll_y` FLOAT(4,2) NOT NULL DEFAULT '0.01' AFTER `cloud_scroll_x_lock`; |
801 | COMMIT; | 801 | COMMIT; |
802 | 802 | ||
803 | :VERSION 35 #--------------------- | ||
804 | -- Added post 0.7 | ||
805 | |||
806 | BEGIN; | ||
807 | ALTER TABLE prims ADD COLUMN MediaURL varchar(255); | ||
808 | ALTER TABLE primshapes ADD COLUMN Media TEXT; | ||
809 | COMMIT; \ No newline at end of file | ||