diff options
| author | Adam Frisby | 2009-10-02 10:54:01 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-10-02 10:54:01 +1000 |
| commit | a2cdbd784db2630d83546fcd9a41d2c8e2103408 (patch) | |
| tree | 419af5c711a59add7ce64aa1c16b9d6001500f05 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | * Attempting to fix a issue with console commands & the estate module. Again. (diff) | |
| parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.zip opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.gz opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.bz2 opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0aa587e..05a6f13 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2305,8 +2305,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2305 | "to avatar {0} at position {1}", | 2305 | "to avatar {0} at position {1}", |
| 2306 | sp.UUID.ToString(), grp.AbsolutePosition); | 2306 | sp.UUID.ToString(), grp.AbsolutePosition); |
| 2307 | AttachObject(sp.ControllingClient, | 2307 | AttachObject(sp.ControllingClient, |
| 2308 | grp.LocalId, 0, | 2308 | grp.LocalId, (uint)0, |
| 2309 | grp.Rotation, | 2309 | grp.GroupRotation, |
| 2310 | grp.AbsolutePosition, false); | 2310 | grp.AbsolutePosition, false); |
| 2311 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2311 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2312 | grp.SendGroupFullUpdate(); | 2312 | grp.SendGroupFullUpdate(); |