5 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index b06788b..2bb3d38 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
                     object_data["Density"] = obj.Density;
                     object_data["Friction"] = obj.Friction;
-                    object_data["Restitution"] = obj.Bounciness;
+                    object_data["Restitution"] = obj.Restitution;
                     object_data["GravityMultiplier"] = obj.GravityModifier;
 
                     resp[uuid.ToString()] = object_data;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f2b0160..ca15e3e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2654,7 +2654,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         byte physshapetype = part.PhysicsShapeType;
                         float density = part.Density;
                         float friction = part.Friction;
-                        float bounce = part.Bounciness;
+                        float bounce = part.Restitution;
                         float gravmod = part.GravityModifier;
 
                         eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8528edc..0d2da03 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public float Bounciness
+        public float Restitution
         {
             get { return m_bounce; }
             set
@@ -4493,8 +4493,8 @@ namespace OpenSim.Region.Framework.Scenes
                 GravityModifier = physdata.GravitationModifier;
             if(Friction != physdata.Friction)
                 Friction = physdata.Friction;
-            if(Bounciness != physdata.Bounce)
-                Bounciness = physdata.Bounce;
+            if(Restitution != physdata.Bounce)
+                Restitution = physdata.Bounce;
         }
         /// <summary>
         /// 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 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());
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 01a649b..6685764 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7845,7 +7845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
             physdata.Density = part.Density;
             physdata.Friction = part.Friction;
-            physdata.Bounce = part.Bounciness;
+            physdata.Bounce = part.Restitution;
             physdata.GravitationModifier = part.GravityModifier;
 
             if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
@@ -8238,7 +8238,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             ExtraPhysicsData physdata = new ExtraPhysicsData();
                             physdata.Density = part.Density;
-                            physdata.Bounce = part.Bounciness;
+                            physdata.Bounce = part.Restitution;
                             physdata.GravitationModifier = part.GravityModifier;
                             physdata.PhysShapeType = (PhysShapeType)shape_type;