diff options
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 19 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 1b02b4f..9cc6f40 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -173,9 +173,9 @@ namespace OpenSim.Data.MySQL | |||
173 | "ParticleSystem, ClickAction, Material, " + | 173 | "ParticleSystem, ClickAction, Material, " + |
174 | "CollisionSound, CollisionSoundVolume, " + | 174 | "CollisionSound, CollisionSoundVolume, " + |
175 | "PassTouches, " + | 175 | "PassTouches, " + |
176 | "LinkNumber, MediaURL, " + | 176 | "LinkNumber, MediaURL, DynAttrs, " + |
177 | "PhysicsShapeType, Density, GravityModifier, " + | 177 | "PhysicsShapeType, Density, GravityModifier, " + |
178 | "Friction, Restitution, DynAttrs " + | 178 | "Friction, Restitution " + |
179 | ") values (" + "?UUID, " + | 179 | ") values (" + "?UUID, " + |
180 | "?CreationDate, ?Name, ?Text, " + | 180 | "?CreationDate, ?Name, ?Text, " + |
181 | "?Description, ?SitName, ?TouchName, " + | 181 | "?Description, ?SitName, ?TouchName, " + |
@@ -208,9 +208,9 @@ namespace OpenSim.Data.MySQL | |||
208 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 208 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
209 | "?ClickAction, ?Material, ?CollisionSound, " + | 209 | "?ClickAction, ?Material, ?CollisionSound, " + |
210 | "?CollisionSoundVolume, ?PassTouches, " + | 210 | "?CollisionSoundVolume, ?PassTouches, " + |
211 | "?LinkNumber, ?MediaURL, " + | 211 | "?LinkNumber, ?MediaURL, ?DynAttrs, " + |
212 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | 212 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + |
213 | "?Friction, ?Restitution, ?DynAttrs)"; | 213 | "?Friction, ?Restitution)"; |
214 | 214 | ||
215 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 215 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
216 | 216 | ||
@@ -1659,16 +1659,17 @@ namespace OpenSim.Data.MySQL | |||
1659 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1659 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1660 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | 1660 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); |
1661 | 1661 | ||
1662 | cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType); | ||
1663 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); | ||
1664 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | ||
1665 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | ||
1666 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); | ||
1667 | 1662 | ||
1668 | if (prim.DynAttrs.Count > 0) | 1663 | if (prim.DynAttrs.Count > 0) |
1669 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); | 1664 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); |
1670 | else | 1665 | else |
1671 | cmd.Parameters.AddWithValue("DynAttrs", null); | 1666 | cmd.Parameters.AddWithValue("DynAttrs", null); |
1667 | |||
1668 | cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType); | ||
1669 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); | ||
1670 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | ||
1671 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | ||
1672 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); | ||
1672 | } | 1673 | } |
1673 | 1674 | ||
1674 | /// <summary> | 1675 | /// <summary> |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 48cd60b..513c784 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -911,7 +911,7 @@ ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | |||
911 | 911 | ||
912 | COMMIT; | 912 | COMMIT; |
913 | 913 | ||
914 | :VERSION 47 #---------------- Extra prim params | 914 | :VERSION 47 #---------------- Extra physics params |
915 | 915 | ||
916 | BEGIN; | 916 | BEGIN; |
917 | 917 | ||