diff options
| author | Melanie | 2012-06-26 17:35:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-26 17:35:55 +0100 |
| commit | 7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9 (patch) | |
| tree | 5492a786c85a7edd63fb8ad0c3c6f1da8d700741 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | When attachments are being saved and deleted for a closing root agent, delete... (diff) | |
| download | opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.zip opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.gz opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.bz2 opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 88afee7..11d703a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3640,6 +3640,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3640 | m_scene.PhysicsScene.AddPhysicsActorTaint(actor); | 3640 | m_scene.PhysicsScene.AddPhysicsActorTaint(actor); |
| 3641 | } | 3641 | } |
| 3642 | 3642 | ||
| 3643 | if (IsAttachment) | ||
| 3644 | { | ||
| 3645 | m_rootPart.AttachedPos = pos; | ||
| 3646 | } | ||
| 3647 | |||
| 3643 | AbsolutePosition = pos; | 3648 | AbsolutePosition = pos; |
| 3644 | 3649 | ||
| 3645 | HasGroupChanged = true; | 3650 | HasGroupChanged = true; |