diff options
author | Melanie | 2013-02-07 03:40:48 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 03:40:48 +0000 |
commit | 6aa876a83b08390ab057eb012fd2c730010f79d8 (patch) | |
tree | dd041d7adf33ea827f535337710e302acb1ba812 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.zip opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.gz opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.bz2 opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.xz |
Rename Bounciness to Restitution
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8be39a7..19214ec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7801,7 +7801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7801 | physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType; | 7801 | physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType; |
7802 | physdata.Density = part.Density; | 7802 | physdata.Density = part.Density; |
7803 | physdata.Friction = part.Friction; | 7803 | physdata.Friction = part.Friction; |
7804 | physdata.Bounce = part.Bounciness; | 7804 | physdata.Bounce = part.Restitution; |
7805 | physdata.GravitationModifier = part.GravityModifier; | 7805 | physdata.GravitationModifier = part.GravityModifier; |
7806 | 7806 | ||
7807 | if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0) | 7807 | if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0) |
@@ -8194,7 +8194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8194 | 8194 | ||
8195 | ExtraPhysicsData physdata = new ExtraPhysicsData(); | 8195 | ExtraPhysicsData physdata = new ExtraPhysicsData(); |
8196 | physdata.Density = part.Density; | 8196 | physdata.Density = part.Density; |
8197 | physdata.Bounce = part.Bounciness; | 8197 | physdata.Bounce = part.Restitution; |
8198 | physdata.GravitationModifier = part.GravityModifier; | 8198 | physdata.GravitationModifier = part.GravityModifier; |
8199 | physdata.PhysShapeType = (PhysShapeType)shape_type; | 8199 | physdata.PhysShapeType = (PhysShapeType)shape_type; |
8200 | 8200 | ||