diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 89600db..9467124 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -171,6 +171,7 @@ namespace OpenSim.Data.MySQL | |||
171 | "ParticleSystem, ClickAction, Material, " + | 171 | "ParticleSystem, ClickAction, Material, " + |
172 | "CollisionSound, CollisionSoundVolume, " + | 172 | "CollisionSound, CollisionSoundVolume, " + |
173 | "PassTouches, " + | 173 | "PassTouches, " + |
174 | "PassCollisions, " + | ||
174 | "LinkNumber, MediaURL, KeyframeMotion, " + | 175 | "LinkNumber, MediaURL, KeyframeMotion, " + |
175 | "PhysicsShapeType, Density, GravityModifier, " + | 176 | "PhysicsShapeType, Density, GravityModifier, " + |
176 | "Friction, Restitution) values (" + "?UUID, " + | 177 | "Friction, Restitution) values (" + "?UUID, " + |
@@ -204,7 +205,7 @@ namespace OpenSim.Data.MySQL | |||
204 | "?SaleType, ?ColorR, ?ColorG, " + | 205 | "?SaleType, ?ColorR, ?ColorG, " + |
205 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 206 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
206 | "?ClickAction, ?Material, ?CollisionSound, " + | 207 | "?ClickAction, ?Material, ?CollisionSound, " + |
207 | "?CollisionSoundVolume, ?PassTouches, " + | 208 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + |
208 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + | 209 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + |
209 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | 210 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + |
210 | "?Friction, ?Restitution)"; | 211 | "?Friction, ?Restitution)"; |
@@ -1231,6 +1232,7 @@ namespace OpenSim.Data.MySQL | |||
1231 | prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"]; | 1232 | prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"]; |
1232 | 1233 | ||
1233 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); | 1234 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); |
1235 | prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0); | ||
1234 | prim.LinkNum = (int)row["LinkNumber"]; | 1236 | prim.LinkNum = (int)row["LinkNumber"]; |
1235 | 1237 | ||
1236 | if (!(row["MediaURL"] is System.DBNull)) | 1238 | if (!(row["MediaURL"] is System.DBNull)) |
@@ -1605,6 +1607,11 @@ namespace OpenSim.Data.MySQL | |||
1605 | else | 1607 | else |
1606 | cmd.Parameters.AddWithValue("PassTouches", 0); | 1608 | cmd.Parameters.AddWithValue("PassTouches", 0); |
1607 | 1609 | ||
1610 | if (prim.PassCollisions) | ||
1611 | cmd.Parameters.AddWithValue("PassCollisions", 1); | ||
1612 | else | ||
1613 | cmd.Parameters.AddWithValue("PassCollisions", 0); | ||
1614 | |||
1608 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1615 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1609 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | 1616 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); |
1610 | 1617 | ||