diff options
| author | Melanie | 2013-02-07 23:34:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 23:34:47 +0000 |
| commit | a2dad09172ce462ea38ff77b684f07ae4b22fbd8 (patch) | |
| tree | b6ce5416e01391fe6ab195b551bec47f3d209fbd /OpenSim | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-a2dad09172ce462ea38ff77b684f07ae4b22fbd8.zip opensim-SC_OLD-a2dad09172ce462ea38ff77b684f07ae4b22fbd8.tar.gz opensim-SC_OLD-a2dad09172ce462ea38ff77b684f07ae4b22fbd8.tar.bz2 opensim-SC_OLD-a2dad09172ce462ea38ff77b684f07ae4b22fbd8.tar.xz | |
Actually plumb the new values to physics.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 9f602f7..9b29973 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1407,6 +1407,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1407 | 1407 | ||
| 1408 | if (ParentGroup != null) | 1408 | if (ParentGroup != null) |
| 1409 | ParentGroup.HasGroupChanged = true; | 1409 | ParentGroup.HasGroupChanged = true; |
| 1410 | |||
| 1411 | PhysicsActor pa = PhysActor; | ||
| 1412 | if (pa != null) | ||
| 1413 | pa.Density = Density; | ||
| 1410 | } | 1414 | } |
| 1411 | } | 1415 | } |
| 1412 | 1416 | ||
| @@ -1426,6 +1430,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1426 | if (ParentGroup != null) | 1430 | if (ParentGroup != null) |
| 1427 | ParentGroup.HasGroupChanged = true; | 1431 | ParentGroup.HasGroupChanged = true; |
| 1428 | 1432 | ||
| 1433 | PhysicsActor pa = PhysActor; | ||
| 1434 | if (pa != null) | ||
| 1435 | pa.GravModifier = GravityModifier; | ||
| 1429 | } | 1436 | } |
| 1430 | } | 1437 | } |
| 1431 | 1438 | ||
| @@ -1444,6 +1451,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1444 | 1451 | ||
| 1445 | if (ParentGroup != null) | 1452 | if (ParentGroup != null) |
| 1446 | ParentGroup.HasGroupChanged = true; | 1453 | ParentGroup.HasGroupChanged = true; |
| 1454 | |||
| 1455 | PhysicsActor pa = PhysActor; | ||
| 1456 | if (pa != null) | ||
| 1457 | pa.Friction = Friction; | ||
| 1447 | } | 1458 | } |
| 1448 | } | 1459 | } |
| 1449 | 1460 | ||
| @@ -1462,6 +1473,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1462 | 1473 | ||
| 1463 | if (ParentGroup != null) | 1474 | if (ParentGroup != null) |
| 1464 | ParentGroup.HasGroupChanged = true; | 1475 | ParentGroup.HasGroupChanged = true; |
| 1476 | |||
| 1477 | PhysicsActor pa = PhysActor; | ||
| 1478 | if (pa != null) | ||
| 1479 | pa.Restitution = Restitution; | ||
| 1465 | } | 1480 | } |
| 1466 | } | 1481 | } |
| 1467 | 1482 | ||
| @@ -4260,6 +4275,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4260 | pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info | 4275 | pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info |
| 4261 | pa.SetMaterial(Material); | 4276 | pa.SetMaterial(Material); |
| 4262 | 4277 | ||
| 4278 | pa.Density = Density; | ||
| 4279 | pa.GravModifier = GravityModifier; | ||
| 4280 | pa.Friction = Friction; | ||
| 4281 | pa.Restitution = Restitution; | ||
| 4282 | |||
| 4263 | if (VolumeDetectActive) // change if not the default only | 4283 | if (VolumeDetectActive) // change if not the default only |
| 4264 | pa.SetVolumeDetect(1); | 4284 | pa.SetVolumeDetect(1); |
| 4265 | // we are going to tell rest of code about physics so better have this here | 4285 | // we are going to tell rest of code about physics so better have this here |