diff options
| author | Melanie | 2012-05-27 19:35:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-27 19:35:36 +0100 |
| commit | 78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63 (patch) | |
| tree | f89d40cb907cd6d8a0df0432c089633c1eb50b8b /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.zip opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.gz opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.bz2 opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.xz | |
Merge branch 'avination' into careminster
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 5328ddc..46a7e3d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3763,7 +3763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3763 | } | 3763 | } |
| 3764 | if ((change & ObjectChangeType.Position) != 0) | 3764 | if ((change & ObjectChangeType.Position) != 0) |
| 3765 | { | 3765 | { |
| 3766 | if (m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) | 3766 | if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) |
| 3767 | UpdateGroupPosition(data.position); | 3767 | UpdateGroupPosition(data.position); |
| 3768 | updateType = updatetype.groupterse; | 3768 | updateType = updatetype.groupterse; |
| 3769 | } | 3769 | } |