aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:40:48 +0000
committerMelanie2013-02-07 21:25:55 +0000
commitbbda7b94b3fe2350d5413879388cfce7309ca907 (patch)
tree64a015606e3c158f2a23684324f56a2573ac1a47 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentMove SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP (diff)
downloadopensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.zip
opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.gz
opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.bz2
opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.xz
Rename Bounciness to Restitution
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
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 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
7845 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType; 7845 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7846 physdata.Density = part.Density; 7846 physdata.Density = part.Density;
7847 physdata.Friction = part.Friction; 7847 physdata.Friction = part.Friction;
7848 physdata.Bounce = part.Bounciness; 7848 physdata.Bounce = part.Restitution;
7849 physdata.GravitationModifier = part.GravityModifier; 7849 physdata.GravitationModifier = part.GravityModifier;
7850 7850
7851 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0) 7851 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
@@ -8238,7 +8238,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8238 8238
8239 ExtraPhysicsData physdata = new ExtraPhysicsData(); 8239 ExtraPhysicsData physdata = new ExtraPhysicsData();
8240 physdata.Density = part.Density; 8240 physdata.Density = part.Density;
8241 physdata.Bounce = part.Bounciness; 8241 physdata.Bounce = part.Restitution;
8242 physdata.GravitationModifier = part.GravityModifier; 8242 physdata.GravitationModifier = part.GravityModifier;
8243 physdata.PhysShapeType = (PhysShapeType)shape_type; 8243 physdata.PhysShapeType = (PhysShapeType)shape_type;
8244 8244