aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-15 02:02:39 +0100
committerJustin Clark-Casey (justincc)2011-10-15 02:02:39 +0100
commitc93c9ea072f319125f466c913f5f4fe1f6864045 (patch)
treece4c0f6f47582c01f8c27fe47a2e78c4d4fed0db /OpenSim/Region/CoreModules
parentreduce access to ODECharacter methods to make code analysis easier. Eliminat... (diff)
downloadopensim-SC_OLD-c93c9ea072f319125f466c913f5f4fe1f6864045.zip
opensim-SC_OLD-c93c9ea072f319125f466c913f5f4fe1f6864045.tar.gz
opensim-SC_OLD-c93c9ea072f319125f466c913f5f4fe1f6864045.tar.bz2
opensim-SC_OLD-c93c9ea072f319125f466c913f5f4fe1f6864045.tar.xz
factor common code out into SOP.RemoveFromPhysics()
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs5
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 f893eb3..01f4808 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -530,10 +530,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
530 so.AttachedAvatar = sp.UUID; 530 so.AttachedAvatar = sp.UUID;
531 531
532 if (so.RootPart.PhysActor != null) 532 if (so.RootPart.PhysActor != null)
533 { 533 so.RootPart.RemoveFromPhysics();
534 m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
535 so.RootPart.PhysActor = null;
536 }
537 534
538 so.AbsolutePosition = attachOffset; 535 so.AbsolutePosition = attachOffset;
539 so.RootPart.AttachedPos = attachOffset; 536 so.RootPart.AttachedPos = attachOffset;