diff options
author | Melanie | 2013-02-07 03:40:48 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 03:40:48 +0000 |
commit | 6aa876a83b08390ab057eb012fd2c730010f79d8 (patch) | |
tree | dd041d7adf33ea827f535337710e302acb1ba812 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.zip opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.gz opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.bz2 opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.xz |
Rename Bounciness to Restitution
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 5c37c07..ce4fb40 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -634,7 +634,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
634 | 634 | ||
635 | private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) | 635 | private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) |
636 | { | 636 | { |
637 | obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty); | 637 | obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty); |
638 | } | 638 | } |
639 | 639 | ||
640 | private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) | 640 | private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) |
@@ -1377,8 +1377,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1377 | writer.WriteElementString("Density", sop.Density.ToString().ToLower()); | 1377 | writer.WriteElementString("Density", sop.Density.ToString().ToLower()); |
1378 | if (sop.Friction != 0.6f) | 1378 | if (sop.Friction != 0.6f) |
1379 | writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); | 1379 | writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); |
1380 | if (sop.Bounciness != 0.5f) | 1380 | if (sop.Restitution != 0.5f) |
1381 | writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); | 1381 | writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower()); |
1382 | if (sop.GravityModifier != 1.0f) | 1382 | if (sop.GravityModifier != 1.0f) |
1383 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); | 1383 | writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); |
1384 | WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); | 1384 | WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); |