From bbda7b94b3fe2350d5413879388cfce7309ca907 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 7 Feb 2013 03:40:48 +0000
Subject: Rename Bounciness to Restitution

---
 .../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Serialization')

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
 
         private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
         {
-            obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty);
+            obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
         }
 
         private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
@@ -1363,8 +1363,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 writer.WriteElementString("Density", sop.Density.ToString().ToLower());
             if (sop.Friction != 0.6f)
                 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
-            if (sop.Bounciness != 0.5f)
-                writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower());
+            if (sop.Restitution != 0.5f)
+                writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
             if (sop.GravityModifier != 1.0f)
                 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
             WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
-- 
cgit v1.1