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

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

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 05b69c1..415a82b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1736,7 +1736,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public float Bounciness
+        public float Restitution
         {
             get { return m_bounce; }
             set
@@ -4494,8 +4494,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.
-- 
cgit v1.1