aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:40:48 +0000
committerMelanie2013-02-07 03:40:48 +0000
commit6aa876a83b08390ab057eb012fd2c730010f79d8 (patch)
treedd041d7adf33ea827f535337710e302acb1ba812 /OpenSim/Region/ClientStack
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.zip
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.gz
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.bz2
opensim-SC_OLD-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.xz
Rename Bounciness to Restitution
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 83347e2..d7d4708 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1316,7 +1316,7 @@ namespace OpenSim.Region.ClientStack.Linden
1316 object_data["PhysicsShapeType"] = obj.PhysicsShapeType; 1316 object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
1317 object_data["Density"] = obj.Density; 1317 object_data["Density"] = obj.Density;
1318 object_data["Friction"] = obj.Friction; 1318 object_data["Friction"] = obj.Friction;
1319 object_data["Restitution"] = obj.Bounciness; 1319 object_data["Restitution"] = obj.Restitution;
1320 object_data["GravityMultiplier"] = obj.GravityModifier; 1320 object_data["GravityMultiplier"] = obj.GravityModifier;
1321 1321
1322 resp[uuid.ToString()] = object_data; 1322 resp[uuid.ToString()] = object_data;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0a39ded..f1fe6e1 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
2654 byte physshapetype = part.PhysicsShapeType; 2654 byte physshapetype = part.PhysicsShapeType;
2655 float density = part.Density; 2655 float density = part.Density;
2656 float friction = part.Friction; 2656 float friction = part.Friction;
2657 float bounce = part.Bounciness; 2657 float bounce = part.Restitution;
2658 float gravmod = part.GravityModifier; 2658 float gravmod = part.GravityModifier;
2659 2659
2660 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); 2660 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);