aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:30:02 +0000
committerMelanie2013-02-07 03:30:02 +0000
commit6504e3d4cee1573115e8a83c06227a297a32f093 (patch)
treeca9196a2afb089cbce687d530e9743a1e995732f /OpenSim/Data/MySQL
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6504e3d4cee1573115e8a83c06227a297a32f093.zip
opensim-SC_OLD-6504e3d4cee1573115e8a83c06227a297a32f093.tar.gz
opensim-SC_OLD-6504e3d4cee1573115e8a83c06227a297a32f093.tar.bz2
opensim-SC_OLD-6504e3d4cee1573115e8a83c06227a297a32f093.tar.xz
Rename "Bounciness" to "Restitution"
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs4
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());