diff options
author | Justin Clark-Casey (justincc) | 2010-02-04 22:22:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-02-04 22:22:18 +0000 |
commit | 16467f6654b22da0b660a1184e56485c01fc37e7 (patch) | |
tree | 1c1ba78c60f98f059722090a3663313bf0be1072 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | minor: one method doc (diff) | |
parent | Applying patch #4534 by Misterblue to fix ODE physics stickiness (diff) | |
download | opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.zip opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.gz opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.bz2 opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index b508af5..1ac061a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -627,10 +627,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
627 | } | 627 | } |
628 | 628 | ||
629 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); | 629 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); |
630 | |||
630 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); | 631 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); |
631 | |||
632 | // In case it is later dropped again, don't let | 632 | // In case it is later dropped again, don't let |
633 | // it get cleaned up | 633 | // it get cleaned up |
634 | // | ||
634 | group.RootPart.RemFlag(PrimFlags.TemporaryOnRez); | 635 | group.RootPart.RemFlag(PrimFlags.TemporaryOnRez); |
635 | group.HasGroupChanged = false; | 636 | group.HasGroupChanged = false; |
636 | } | 637 | } |