aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:40:48 +0000
committerMelanie2013-02-07 03:40:48 +0000
commit6aa876a83b08390ab057eb012fd2c730010f79d8 (patch)
treedd041d7adf33ea827f535337710e302acb1ba812 /OpenSim/Data/MySQL
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.zip
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.gz
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.bz2
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.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 3fab27a..30ae7a9 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1345,7 +1345,7 @@ namespace OpenSim.Data.MySQL
1345 prim.Density = (float)(double)row["Density"]; 1345 prim.Density = (float)(double)row["Density"];
1346 prim.GravityModifier = (float)(double)row["GravityModifier"]; 1346 prim.GravityModifier = (float)(double)row["GravityModifier"];
1347 prim.Friction = (float)(double)row["Friction"]; 1347 prim.Friction = (float)(double)row["Friction"];
1348 prim.Bounciness = (float)(double)row["Restitution"]; 1348 prim.Restitution = (float)(double)row["Restitution"];
1349 1349
1350 SOPVehicle vehicle = null; 1350 SOPVehicle vehicle = null;
1351 1351
@@ -1731,7 +1731,7 @@ namespace OpenSim.Data.MySQL
1731 cmd.Parameters.AddWithValue("Density", (double)prim.Density); 1731 cmd.Parameters.AddWithValue("Density", (double)prim.Density);
1732 cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); 1732 cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier);
1733 cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); 1733 cmd.Parameters.AddWithValue("Friction", (double)prim.Friction);
1734 cmd.Parameters.AddWithValue("Restitution", (double)prim.Bounciness); 1734 cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution);
1735 1735
1736 if (prim.VehicleParams != null) 1736 if (prim.VehicleParams != null)
1737 cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2()); 1737 cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2());