diff options
| author | Diva Canto | 2013-05-28 20:59:54 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-28 20:59:54 -0700 |
| commit | 233b9ec4d7739f324360366079469f2026c4ce41 (patch) | |
| tree | 61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff) | |
| parent | BulletSim: don't zero motion when changing vehicle type. (diff) | |
| download | opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2 opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 38fa26a..df23cc5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1499,7 +1499,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1499 | if (!userExposed) | 1499 | if (!userExposed) |
| 1500 | dupe.IsAttachment = true; | 1500 | dupe.IsAttachment = true; |
| 1501 | 1501 | ||
| 1502 | dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); | 1502 | dupe.m_sittingAvatars = new List<UUID>(); |
| 1503 | 1503 | ||
| 1504 | if (!userExposed) | 1504 | if (!userExposed) |
| 1505 | { | 1505 | { |