diff options
| author | idb | 2009-01-19 19:15:55 +0000 |
|---|---|---|
| committer | idb | 2009-01-19 19:15:55 +0000 |
| commit | a47d8512956f3da8ad64dfee7c0a5696d11c232d (patch) | |
| tree | 957c737318e1c889a4c6da6dec863c1b744ae289 /OpenSim/Region/Environment | |
| parent | * Set SVN Properties (diff) | |
| download | opensim-SC_OLD-a47d8512956f3da8ad64dfee7c0a5696d11c232d.zip opensim-SC_OLD-a47d8512956f3da8ad64dfee7c0a5696d11c232d.tar.gz opensim-SC_OLD-a47d8512956f3da8ad64dfee7c0a5696d11c232d.tar.bz2 opensim-SC_OLD-a47d8512956f3da8ad64dfee7c0a5696d11c232d.tar.xz | |
Correct energy calculation to include the mass of the object.
Fixes Mantis #3006
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index ed299eb..404a7c3 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
| @@ -2473,7 +2473,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 2473 | //group.ApplyPhysics(m_physicalPrim); | 2473 | //group.ApplyPhysics(m_physicalPrim); |
| 2474 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) | 2474 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) |
| 2475 | { | 2475 | { |
| 2476 | group.RootPart.ApplyImpulse(vel, false); | 2476 | group.RootPart.ApplyImpulse((vel * group.GetMass()), false); |
| 2477 | group.Velocity = vel; | 2477 | group.Velocity = vel; |
| 2478 | rootPart.ScheduleFullUpdate(); | 2478 | rootPart.ScheduleFullUpdate(); |
| 2479 | } | 2479 | } |