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/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix the real cause of double velocity (diff) | |
| download | opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC-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/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 315b340..9c80d3e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2701,7 +2701,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2701 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2701 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2702 | 2702 | ||
| 2703 | if (AttachmentsModule != null) | 2703 | if (AttachmentsModule != null) |
| 2704 | AttachmentsModule.AttachObject(sp, grp, 0, false); | 2704 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); |
| 2705 | } | 2705 | } |
| 2706 | else | 2706 | else |
| 2707 | { | 2707 | { |