diff options
| author | Justin Clark-Casey (justincc) | 2010-07-14 23:29:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-14 23:29:04 +0100 |
| commit | 99a6950b3089b7d945d2e7981780e44e469a4ed8 (patch) | |
| tree | 9f1a58921f77da1e393352b1c1ed2e383f5da317 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | improve closing of load/save iar streams in the event of a problem (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.zip opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.gz opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.bz2 opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 40176ec..b0f4ac0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2571,8 +2571,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2571 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2571 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2572 | 2572 | ||
| 2573 | if (AttachmentsModule != null) | 2573 | if (AttachmentsModule != null) |
| 2574 | AttachmentsModule.AttachObject( | 2574 | AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false); |
| 2575 | sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); | ||
| 2576 | 2575 | ||
| 2577 | } | 2576 | } |
| 2578 | else | 2577 | else |