diff options
| author | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
| commit | 9e17dc3daa04644c1a565d819a614c02022bdeed (patch) | |
| tree | 014eb8cec88c68b2dedde009a508dde3b5b52aca /OpenSim/Data | |
| parent | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff) | |
| parent | Plumb the path from the client to the extra physics params and back (diff) | |
| download | opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.zip opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2 opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 41174f4..1b02b4f 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1311,7 +1311,7 @@ namespace OpenSim.Data.MySQL | |||
| 1311 | prim.Density = (float)(double)row["Density"]; | 1311 | prim.Density = (float)(double)row["Density"]; |
| 1312 | prim.GravityModifier = (float)(double)row["GravityModifier"]; | 1312 | prim.GravityModifier = (float)(double)row["GravityModifier"]; |
| 1313 | prim.Friction = (float)(double)row["Friction"]; | 1313 | prim.Friction = (float)(double)row["Friction"]; |
| 1314 | prim.Bounciness = (float)(double)row["Restitution"]; | 1314 | prim.Restitution = (float)(double)row["Restitution"]; |
| 1315 | 1315 | ||
| 1316 | return prim; | 1316 | return prim; |
| 1317 | } | 1317 | } |
| @@ -1663,7 +1663,7 @@ namespace OpenSim.Data.MySQL | |||
| 1663 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); | 1663 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); |
| 1664 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | 1664 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); |
| 1665 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | 1665 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); |
| 1666 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Bounciness); | 1666 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); |
| 1667 | 1667 | ||
| 1668 | if (prim.DynAttrs.Count > 0) | 1668 | if (prim.DynAttrs.Count > 0) |
| 1669 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); | 1669 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); |