diff options
| author | Melanie | 2012-02-26 14:30:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-26 14:30:24 +0100 |
| commit | 8cdc115c91bd074539c5fbae719313d4dc616355 (patch) | |
| tree | b071a6011f0644044f02be9ecdd0e84ac957d468 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Fix an infinite recursion caused by checking the wrong values for (diff) | |
| download | opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.zip opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.gz opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.bz2 opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.xz | |
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
code.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d488189..ac2fe82 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -896,6 +896,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 896 | ApplyPhysics(); | 896 | ApplyPhysics(); |
| 897 | 897 | ||
| 898 | if (RootPart.PhysActor != null) | 898 | if (RootPart.PhysActor != null) |
| 899 | RootPart.Force = RootPart.Force; | ||
| 900 | if (RootPart.PhysActor != null) | ||
| 901 | RootPart.Torque = RootPart.Torque; | ||
| 902 | if (RootPart.PhysActor != null) | ||
| 899 | RootPart.Buoyancy = RootPart.Buoyancy; | 903 | RootPart.Buoyancy = RootPart.Buoyancy; |
| 900 | 904 | ||
| 901 | // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled | 905 | // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled |