diff options
| author | Diva Canto | 2010-07-14 14:48:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-14 14:48:14 -0700 |
| commit | 0d8c0811d381951939efd4e2887b872e81a6a34a (patch) | |
| tree | 1424db67347d3e441817cf8860327a8d884b061a /OpenSim/Region/Framework/Scenes | |
| parent | Removed a few obsolete mono addin references. Mantis #4854 (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.zip opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.gz opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.bz2 opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 |