diff options
author | Melanie | 2013-02-07 03:30:02 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 03:30:02 +0000 |
commit | 6504e3d4cee1573115e8a83c06227a297a32f093 (patch) | |
tree | ca9196a2afb089cbce687d530e9743a1e995732f /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-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')
4 files changed, 9 insertions, 9 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()); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 55b5462..b00f388 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1390,7 +1390,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1390 | public float Density { get; set; } | 1390 | public float Density { get; set; } |
1391 | public float GravityModifier { get; set; } | 1391 | public float GravityModifier { get; set; } |
1392 | public float Friction { get; set; } | 1392 | public float Friction { get; set; } |
1393 | public float Bounciness { get; set; } | 1393 | public float Restitution { get; set; } |
1394 | 1394 | ||
1395 | #endregion Public Properties with only Get | 1395 | #endregion Public Properties with only Get |
1396 | 1396 | ||
@@ -3964,8 +3964,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3964 | GravityModifier = physdata.GravitationModifier; | 3964 | GravityModifier = physdata.GravitationModifier; |
3965 | if(Friction != physdata.Friction) | 3965 | if(Friction != physdata.Friction) |
3966 | Friction = physdata.Friction; | 3966 | Friction = physdata.Friction; |
3967 | if(Bounciness != physdata.Bounce) | 3967 | if(Restitution != physdata.Bounce) |
3968 | Bounciness = physdata.Bounce; | 3968 | Restitution = physdata.Bounce; |
3969 | } | 3969 | } |
3970 | /// <summary> | 3970 | /// <summary> |
3971 | /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. | 3971 | /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 78229fe..39420a6 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -618,7 +618,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
618 | 618 | ||
619 | private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) | 619 | private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) |
620 | { | 620 | { |
621 | obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty); | 621 | obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty); |
622 | } | 622 | } |
623 | 623 | ||
624 | private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) | 624 | private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) |
@@ -1295,8 +1295,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1295 | writer.WriteElementString("Density", sop.Density.ToString().ToLower()); | 1295 | writer.WriteElementString("Density", sop.Density.ToString().ToLower()); |
1296 | if (sop.Friction != 0.6f) | 1296 | if (sop.Friction != 0.6f) |
1297 | writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); | 1297 | writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); |
1298 | if (sop.Bounciness != 0.5f) | 1298 | if (sop.Restitution != 0.5f) |
1299 | writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); | 1299 | writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower()); |
1300 | if (sop.GravityModifier != 1.0f) | 1300 | if (sop.GravityModifier != 1.0f) |
1301 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); | 1301 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); |
1302 | 1302 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 64052ae..be6ac0a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7602,7 +7602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7602 | 7602 | ||
7603 | ExtraPhysicsData physdata = new ExtraPhysicsData(); | 7603 | ExtraPhysicsData physdata = new ExtraPhysicsData(); |
7604 | physdata.Density = part.Density; | 7604 | physdata.Density = part.Density; |
7605 | physdata.Bounce = part.Bounciness; | 7605 | physdata.Bounce = part.Restitution; |
7606 | physdata.GravitationModifier = part.GravityModifier; | 7606 | physdata.GravitationModifier = part.GravityModifier; |
7607 | physdata.PhysShapeType = (PhysShapeType)shape_type; | 7607 | physdata.PhysShapeType = (PhysShapeType)shape_type; |
7608 | 7608 | ||