From 511fc663a24db9d042d0c5a97820870bbff6c085 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 17 May 2012 21:36:27 +0200 Subject: [PATCH 1/2] Temprorarily disable collision sounds until we have some sound bites --- OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index 5d4302730c..130eb20f14 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs @@ -127,6 +127,8 @@ namespace OpenSim.Region.Framework.Scenes public static void PartCollisionSound(SceneObjectPart part,List Colliders) { + return; + if(Colliders.Count == 0 || part == null) return; @@ -214,6 +216,8 @@ namespace OpenSim.Region.Framework.Scenes public static void AvatarCollisionSound(ScenePresence av, List Colliders) { + return; + if (Colliders.Count == 0 || av == null) return; @@ -268,4 +272,4 @@ namespace OpenSim.Region.Framework.Scenes } } -} \ No newline at end of file +} From d69f197a5d8946c576b5e799f04f209400e2e227 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 19 May 2012 12:35:07 +0200 Subject: [PATCH 2/2] Fix setting positions of attachments. The recent security fix regarding prim entry messed it up. --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index a6551c13b1..756888894d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -3741,7 +3741,7 @@ namespace OpenSim.Region.Framework.Scenes } if ((change & ObjectChangeType.Position) != 0) { - if (m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) + if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) UpdateGroupPosition(data.position); updateType = updatetype.groupterse; }