diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index d562783..c95311e 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -171,7 +171,8 @@ namespace OpenSim.Data.MySQL | |||
171 | "ParticleSystem, ClickAction, Material, " + | 171 | "ParticleSystem, ClickAction, Material, " + |
172 | "CollisionSound, CollisionSoundVolume, " + | 172 | "CollisionSound, CollisionSoundVolume, " + |
173 | "PassTouches, " + | 173 | "PassTouches, " + |
174 | "LinkNumber, MediaURL) values (" + "?UUID, " + | 174 | "LinkNumber, MediaURL, DynAttrs) " + |
175 | "values (?UUID, " + | ||
175 | "?CreationDate, ?Name, ?Text, " + | 176 | "?CreationDate, ?Name, ?Text, " + |
176 | "?Description, ?SitName, ?TouchName, " + | 177 | "?Description, ?SitName, ?TouchName, " + |
177 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + | 178 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + |
@@ -202,7 +203,8 @@ namespace OpenSim.Data.MySQL | |||
202 | "?SaleType, ?ColorR, ?ColorG, " + | 203 | "?SaleType, ?ColorR, ?ColorG, " + |
203 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 204 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
204 | "?ClickAction, ?Material, ?CollisionSound, " + | 205 | "?ClickAction, ?Material, ?CollisionSound, " + |
205 | "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)"; | 206 | "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, " + |
207 | "?MediaURL, ?DynAttrs)"; | ||
206 | 208 | ||
207 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 209 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
208 | 210 | ||
@@ -219,7 +221,8 @@ namespace OpenSim.Data.MySQL | |||
219 | "PathTaperX, PathTaperY, PathTwist, " + | 221 | "PathTaperX, PathTaperY, PathTwist, " + |
220 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + | 222 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + |
221 | "ProfileCurve, ProfileHollow, Texture, " + | 223 | "ProfileCurve, ProfileHollow, Texture, " + |
222 | "ExtraParams, State, Media) values (?UUID, " + | 224 | "ExtraParams, State, Media) " + |
225 | "values (?UUID, " + | ||
223 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + | 226 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + |
224 | "?PCode, ?PathBegin, ?PathEnd, " + | 227 | "?PCode, ?PathBegin, ?PathEnd, " + |
225 | "?PathScaleX, ?PathScaleY, " + | 228 | "?PathScaleX, ?PathScaleY, " + |
@@ -1291,6 +1294,11 @@ namespace OpenSim.Data.MySQL | |||
1291 | 1294 | ||
1292 | if (!(row["MediaURL"] is System.DBNull)) | 1295 | if (!(row["MediaURL"] is System.DBNull)) |
1293 | prim.MediaUrl = (string)row["MediaURL"]; | 1296 | prim.MediaUrl = (string)row["MediaURL"]; |
1297 | |||
1298 | if (!(row["DynAttrs"] is System.DBNull)) | ||
1299 | prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); | ||
1300 | else | ||
1301 | prim.DynAttrs = new DAMap(); | ||
1294 | 1302 | ||
1295 | return prim; | 1303 | return prim; |
1296 | } | 1304 | } |
@@ -1637,6 +1645,11 @@ namespace OpenSim.Data.MySQL | |||
1637 | 1645 | ||
1638 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1646 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1639 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | 1647 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); |
1648 | |||
1649 | if (prim.DynAttrs.Count > 0) | ||
1650 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); | ||
1651 | else | ||
1652 | cmd.Parameters.AddWithValue("DynAttrs", null); | ||
1640 | } | 1653 | } |
1641 | 1654 | ||
1642 | /// <summary> | 1655 | /// <summary> |