aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:30:02 +0000
committerMelanie2013-02-07 03:30:02 +0000
commit6504e3d4cee1573115e8a83c06227a297a32f093 (patch)
treeca9196a2afb089cbce687d530e9743a1e995732f /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.zip
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.gz
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.bz2
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.xz
Rename "Bounciness" to "Restitution"
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 55b5462..b00f388 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1390,7 +1390,7 @@ namespace OpenSim.Region.Framework.Scenes
1390 public float Density { get; set; } 1390 public float Density { get; set; }
1391 public float GravityModifier { get; set; } 1391 public float GravityModifier { get; set; }
1392 public float Friction { get; set; } 1392 public float Friction { get; set; }
1393 public float Bounciness { get; set; } 1393 public float Restitution { get; set; }
1394 1394
1395 #endregion Public Properties with only Get 1395 #endregion Public Properties with only Get
1396 1396
@@ -3964,8 +3964,8 @@ namespace OpenSim.Region.Framework.Scenes
3964 GravityModifier = physdata.GravitationModifier; 3964 GravityModifier = physdata.GravitationModifier;
3965 if(Friction != physdata.Friction) 3965 if(Friction != physdata.Friction)
3966 Friction = physdata.Friction; 3966 Friction = physdata.Friction;
3967 if(Bounciness != physdata.Bounce) 3967 if(Restitution != physdata.Bounce)
3968 Bounciness = physdata.Bounce; 3968 Restitution = physdata.Bounce;
3969 } 3969 }
3970 /// <summary> 3970 /// <summary>
3971 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. 3971 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary.