aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:40:48 +0000
committerMelanie2013-02-07 21:25:55 +0000
commitbbda7b94b3fe2350d5413879388cfce7309ca907 (patch)
tree64a015606e3c158f2a23684324f56a2573ac1a47 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
parentMove SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP (diff)
downloadopensim-SC_OLD-bbda7b94b3fe2350d5413879388cfce7309ca907.zip
opensim-SC_OLD-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.gz
opensim-SC_OLD-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.bz2
opensim-SC_OLD-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.xz
Rename Bounciness to Restitution
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
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 123c158..2984782 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -633,7 +633,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
633 633
634 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) 634 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
635 { 635 {
636 obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty); 636 obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
637 } 637 }
638 638
639 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) 639 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
@@ -1363,8 +1363,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1363 writer.WriteElementString("Density", sop.Density.ToString().ToLower()); 1363 writer.WriteElementString("Density", sop.Density.ToString().ToLower());
1364 if (sop.Friction != 0.6f) 1364 if (sop.Friction != 0.6f)
1365 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); 1365 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
1366 if (sop.Bounciness != 0.5f) 1366 if (sop.Restitution != 0.5f)
1367 writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); 1367 writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
1368 if (sop.GravityModifier != 1.0f) 1368 if (sop.GravityModifier != 1.0f)
1369 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); 1369 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
1370 WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); 1370 WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());