aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-02-07 23:34:47 +0000
committerMelanie2013-02-07 23:36:23 +0000
commit8008938550f5f60b3233a09ca642ea6a45052704 (patch)
tree426028ecc4b453f18f550ce64df8e469dec26e86
parentRename "Bounce" to "Restitution" in PhysicsActor as well. It appears these (diff)
downloadopensim-SC-8008938550f5f60b3233a09ca642ea6a45052704.zip
opensim-SC-8008938550f5f60b3233a09ca642ea6a45052704.tar.gz
opensim-SC-8008938550f5f60b3233a09ca642ea6a45052704.tar.bz2
opensim-SC-8008938550f5f60b3233a09ca642ea6a45052704.tar.xz
Actually plumb the new values to physics.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs20
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0d2da03..20a6626 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1689,6 +1689,10 @@ namespace OpenSim.Region.Framework.Scenes
1689 1689
1690 if (ParentGroup != null) 1690 if (ParentGroup != null)
1691 ParentGroup.HasGroupChanged = true; 1691 ParentGroup.HasGroupChanged = true;
1692
1693 PhysicsActor pa = PhysActor;
1694 if (pa != null)
1695 pa.Density = Density;
1692 } 1696 }
1693 } 1697 }
1694 1698
@@ -1708,6 +1712,9 @@ namespace OpenSim.Region.Framework.Scenes
1708 if (ParentGroup != null) 1712 if (ParentGroup != null)
1709 ParentGroup.HasGroupChanged = true; 1713 ParentGroup.HasGroupChanged = true;
1710 1714
1715 PhysicsActor pa = PhysActor;
1716 if (pa != null)
1717 pa.GravModifier = GravityModifier;
1711 } 1718 }
1712 } 1719 }
1713 1720
@@ -1726,6 +1733,10 @@ namespace OpenSim.Region.Framework.Scenes
1726 1733
1727 if (ParentGroup != null) 1734 if (ParentGroup != null)
1728 ParentGroup.HasGroupChanged = true; 1735 ParentGroup.HasGroupChanged = true;
1736
1737 PhysicsActor pa = PhysActor;
1738 if (pa != null)
1739 pa.Friction = Friction;
1729 } 1740 }
1730 } 1741 }
1731 1742
@@ -1744,6 +1755,10 @@ namespace OpenSim.Region.Framework.Scenes
1744 1755
1745 if (ParentGroup != null) 1756 if (ParentGroup != null)
1746 ParentGroup.HasGroupChanged = true; 1757 ParentGroup.HasGroupChanged = true;
1758
1759 PhysicsActor pa = PhysActor;
1760 if (pa != null)
1761 pa.Restitution = Restitution;
1747 } 1762 }
1748 } 1763 }
1749 1764
@@ -4657,6 +4672,11 @@ namespace OpenSim.Region.Framework.Scenes
4657 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info 4672 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
4658 pa.SetMaterial(Material); 4673 pa.SetMaterial(Material);
4659 4674
4675 pa.Density = Density;
4676 pa.GravModifier = GravityModifier;
4677 pa.Friction = Friction;
4678 pa.Restitution = Restitution;
4679
4660 if (VolumeDetectActive) // change if not the default only 4680 if (VolumeDetectActive) // change if not the default only
4661 pa.SetVolumeDetect(1); 4681 pa.SetVolumeDetect(1);
4662 4682