diff options
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 77fa1ec..1a6a0fb 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Data.MySQL | |||
221 | "PathTaperX, PathTaperY, PathTwist, " + | 221 | "PathTaperX, PathTaperY, PathTwist, " + |
222 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + | 222 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + |
223 | "ProfileCurve, ProfileHollow, Texture, " + | 223 | "ProfileCurve, ProfileHollow, Texture, " + |
224 | "ExtraParams, State, Media, DynAttrs) " + | 224 | "ExtraParams, State, Media) " + |
225 | "values (?UUID, " + | 225 | "values (?UUID, " + |
226 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + | 226 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + |
227 | "?PCode, ?PathBegin, ?PathEnd, " + | 227 | "?PCode, ?PathBegin, ?PathEnd, " + |
@@ -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, ?Media, ?DynAttrs)"; | 236 | "?State, ?Media)"; |
237 | 237 | ||
238 | FillShapeCommand(cmd, prim); | 238 | FillShapeCommand(cmd, prim); |
239 | 239 | ||
@@ -1838,11 +1838,6 @@ namespace OpenSim.Data.MySQL | |||
1838 | 1838 | ||
1839 | if (!(row["Media"] is System.DBNull)) | 1839 | if (!(row["Media"] is System.DBNull)) |
1840 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); | 1840 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); |
1841 | |||
1842 | if (!(row["DynAttrs"] is System.DBNull)) | ||
1843 | s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); | ||
1844 | else | ||
1845 | s.DynAttrs = new DAMap(); | ||
1846 | 1841 | ||
1847 | return s; | 1842 | return s; |
1848 | } | 1843 | } |
@@ -1887,7 +1882,6 @@ namespace OpenSim.Data.MySQL | |||
1887 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); | 1882 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); |
1888 | cmd.Parameters.AddWithValue("State", s.State); | 1883 | cmd.Parameters.AddWithValue("State", s.State); |
1889 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); | 1884 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); |
1890 | cmd.Parameters.AddWithValue("DynAttrs", s.DynAttrs.ToXml()); | ||
1891 | } | 1885 | } |
1892 | 1886 | ||
1893 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | 1887 | 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 1a38836..c48aec2 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -908,6 +908,5 @@ COMMIT; | |||
908 | BEGIN; | 908 | BEGIN; |
909 | 909 | ||
910 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | 910 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; |
911 | ALTER TABLE primshapes ADD COLUMN DynAttrs TEXT; | ||
912 | 911 | ||
913 | COMMIT; | 912 | COMMIT; |