diff options
| author | UbitUmarov | 2012-05-21 12:47:28 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-21 12:47:28 +0100 |
| commit | b92ecc53828e50244d98bf57a52042a8f1dcfb7a (patch) | |
| tree | 8423392b711674c9fd569bee296ceac91cd5abc8 | |
| parent | try to let avas climb higher steps. Will only work in some cases, may have b... (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-b92ecc53828e50244d98bf57a52042a8f1dcfb7a.zip opensim-SC_OLD-b92ecc53828e50244d98bf57a52042a8f1dcfb7a.tar.gz opensim-SC_OLD-b92ecc53828e50244d98bf57a52042a8f1dcfb7a.tar.bz2 opensim-SC_OLD-b92ecc53828e50244d98bf57a52042a8f1dcfb7a.tar.xz | |
Merge branch 'avination' into ubitwork
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index 476eccd..81ca9f1 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||
| @@ -368,4 +368,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 368 | } | 368 | } |
| 369 | } | 369 | } |
| 370 | } | 370 | } |
| 371 | } \ No newline at end of file | 371 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index a6551c1..7568888 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3741,7 +3741,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3741 | } | 3741 | } |
| 3742 | if ((change & ObjectChangeType.Position) != 0) | 3742 | if ((change & ObjectChangeType.Position) != 0) |
| 3743 | { | 3743 | { |
| 3744 | if (m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) | 3744 | if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) |
| 3745 | UpdateGroupPosition(data.position); | 3745 | UpdateGroupPosition(data.position); |
| 3746 | updateType = updatetype.groupterse; | 3746 | updateType = updatetype.groupterse; |
| 3747 | } | 3747 | } |