diff options
| author | Melanie | 2012-06-06 14:16:19 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 14:16:19 +0100 |
| commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
| tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix the real cause of double velocity (diff) | |
| download | opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 23a0550..a62c1ac 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -359,7 +359,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 359 | if (pa != null && pa.IsPhysical && vel != Vector3.Zero) | 359 | if (pa != null && pa.IsPhysical && vel != Vector3.Zero) |
| 360 | { | 360 | { |
| 361 | sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); | 361 | sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); |
| 362 | sceneObject.Velocity = vel; | ||
| 363 | } | 362 | } |
| 364 | 363 | ||
| 365 | return true; | 364 | return true; |