diff options
| author | Melanie | 2011-10-25 01:52:54 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:52:54 +0100 |
| commit | e43e1b49db84cb501030336508cef05be8cf26e4 (patch) | |
| tree | f7c409e9d568de274d7856e696f1a5d23de986b0 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge (diff) | |
| parent | factor common code out into SOP.RemoveFromPhysics() (diff) | |
| download | opensim-SC_OLD-e43e1b49db84cb501030336508cef05be8cf26e4.zip opensim-SC_OLD-e43e1b49db84cb501030336508cef05be8cf26e4.tar.gz opensim-SC_OLD-e43e1b49db84cb501030336508cef05be8cf26e4.tar.bz2 opensim-SC_OLD-e43e1b49db84cb501030336508cef05be8cf26e4.tar.xz | |
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 09781c7..96766f3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -536,10 +536,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 536 | so.AttachedAvatar = sp.UUID; | 536 | so.AttachedAvatar = sp.UUID; |
| 537 | 537 | ||
| 538 | if (so.RootPart.PhysActor != null) | 538 | if (so.RootPart.PhysActor != null) |
| 539 | { | 539 | so.RootPart.RemoveFromPhysics(); |
| 540 | m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor); | ||
| 541 | so.RootPart.PhysActor = null; | ||
| 542 | } | ||
| 543 | 540 | ||
| 544 | so.AbsolutePosition = attachOffset; | 541 | so.AbsolutePosition = attachOffset; |
| 545 | so.RootPart.AttachedPos = attachOffset; | 542 | so.RootPart.AttachedPos = attachOffset; |