diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index d5a4f46..5320543 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL | |||
176 | "PassCollisions, " + | 176 | "PassCollisions, " + |
177 | "LinkNumber, MediaURL, KeyframeMotion, " + | 177 | "LinkNumber, MediaURL, KeyframeMotion, " + |
178 | "PhysicsShapeType, Density, GravityModifier, " + | 178 | "PhysicsShapeType, Density, GravityModifier, " + |
179 | "Friction, Restitution, Vehicle " + | 179 | "Friction, Restitution, Vehicle, DynAttrs " + |
180 | ") values (" + "?UUID, " + | 180 | ") values (" + "?UUID, " + |
181 | "?CreationDate, ?Name, ?Text, " + | 181 | "?CreationDate, ?Name, ?Text, " + |
182 | "?Description, ?SitName, ?TouchName, " + | 182 | "?Description, ?SitName, ?TouchName, " + |
@@ -211,7 +211,7 @@ namespace OpenSim.Data.MySQL | |||
211 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + | 211 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + |
212 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + | 212 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + |
213 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | 213 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + |
214 | "?Friction, ?Restitution, ?Vehicle)"; | 214 | "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)"; |
215 | 215 | ||
216 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 216 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
217 | 217 | ||
@@ -228,7 +228,8 @@ namespace OpenSim.Data.MySQL | |||
228 | "PathTaperX, PathTaperY, PathTwist, " + | 228 | "PathTaperX, PathTaperY, PathTwist, " + |
229 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + | 229 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + |
230 | "ProfileCurve, ProfileHollow, Texture, " + | 230 | "ProfileCurve, ProfileHollow, Texture, " + |
231 | "ExtraParams, State, Media) values (?UUID, " + | 231 | "ExtraParams, State, Media) " + |
232 | "values (?UUID, " + | ||
232 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + | 233 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + |
233 | "?PCode, ?PathBegin, ?PathEnd, " + | 234 | "?PCode, ?PathBegin, ?PathEnd, " + |
234 | "?PathScaleX, ?PathScaleY, " + | 235 | "?PathScaleX, ?PathScaleY, " + |
@@ -1321,6 +1322,11 @@ namespace OpenSim.Data.MySQL | |||
1321 | 1322 | ||
1322 | if (!(row["MediaURL"] is System.DBNull)) | 1323 | if (!(row["MediaURL"] is System.DBNull)) |
1323 | prim.MediaUrl = (string)row["MediaURL"]; | 1324 | prim.MediaUrl = (string)row["MediaURL"]; |
1325 | |||
1326 | if (!(row["DynAttrs"] is System.DBNull)) | ||
1327 | prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); | ||
1328 | else | ||
1329 | prim.DynAttrs = new DAMap(); | ||
1324 | 1330 | ||
1325 | if (!(row["KeyframeMotion"] is DBNull)) | 1331 | if (!(row["KeyframeMotion"] is DBNull)) |
1326 | { | 1332 | { |
@@ -1721,16 +1727,21 @@ namespace OpenSim.Data.MySQL | |||
1721 | else | 1727 | else |
1722 | cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]); | 1728 | cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]); |
1723 | 1729 | ||
1730 | if (prim.VehicleParams != null) | ||
1731 | cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2()); | ||
1732 | else | ||
1733 | cmd.Parameters.AddWithValue("Vehicle", String.Empty); | ||
1734 | |||
1735 | if (prim.DynAttrs.Count > 0) | ||
1736 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); | ||
1737 | else | ||
1738 | cmd.Parameters.AddWithValue("DynAttrs", null); | ||
1739 | |||
1724 | cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType); | 1740 | cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType); |
1725 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); | 1741 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); |
1726 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | 1742 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); |
1727 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | 1743 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); |
1728 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); | 1744 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); |
1729 | |||
1730 | if (prim.VehicleParams != null) | ||
1731 | cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2()); | ||
1732 | else | ||
1733 | cmd.Parameters.AddWithValue("Vehicle", String.Empty); | ||
1734 | } | 1745 | } |
1735 | 1746 | ||
1736 | /// <summary> | 1747 | /// <summary> |