diff options
author | Melanie | 2010-10-10 22:06:47 +0100 |
---|---|---|
committer | Melanie | 2010-10-10 22:06:47 +0100 |
commit | 2804c97a39ece1352bc8ce8cf3672307798417df (patch) | |
tree | dcd923960e778ecf3114c68e2b273e7fcaf3e341 | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-2804c97a39ece1352bc8ce8cf3672307798417df.zip opensim-SC_OLD-2804c97a39ece1352bc8ce8cf3672307798417df.tar.gz opensim-SC_OLD-2804c97a39ece1352bc8ce8cf3672307798417df.tar.bz2 opensim-SC_OLD-2804c97a39ece1352bc8ce8cf3672307798417df.tar.xz |
Change the part for sound playback to be the root part / object UUID instead
of the child prim because using the child prim plain doesn't work.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index efdb94c..726bda1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2730,7 +2730,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2730 | public void PreloadSound(string sound) | 2730 | public void PreloadSound(string sound) |
2731 | { | 2731 | { |
2732 | // UUID ownerID = OwnerID; | 2732 | // UUID ownerID = OwnerID; |
2733 | UUID objectID = UUID; | 2733 | UUID objectID = ParentGroup.RootPart.UUID; |
2734 | UUID soundID = UUID.Zero; | 2734 | UUID soundID = UUID.Zero; |
2735 | 2735 | ||
2736 | if (!UUID.TryParse(sound, out soundID)) | 2736 | if (!UUID.TryParse(sound, out soundID)) |
@@ -3112,7 +3112,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3112 | volume = 0; | 3112 | volume = 0; |
3113 | 3113 | ||
3114 | UUID ownerID = _ownerID; | 3114 | UUID ownerID = _ownerID; |
3115 | UUID objectID = UUID; | 3115 | UUID objectID = ParentGroup.RootPart.UUID; |
3116 | UUID parentID = GetRootPartUUID(); | 3116 | UUID parentID = GetRootPartUUID(); |
3117 | 3117 | ||
3118 | if (ParentGroup.IsAttachment && ParentGroup.RootPart.Shape.State > 30) | 3118 | if (ParentGroup.IsAttachment && ParentGroup.RootPart.Shape.State > 30) |
@@ -3157,11 +3157,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3157 | else | 3157 | else |
3158 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | 3158 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); |
3159 | ParentGroup.PlaySoundMasterPrim = this; | 3159 | ParentGroup.PlaySoundMasterPrim = this; |
3160 | ownerID = this._ownerID; | 3160 | ownerID = _ownerID; |
3161 | objectID = this.UUID; | 3161 | objectID = ParentGroup.RootPart.UUID; |
3162 | parentID = this.GetRootPartUUID(); | 3162 | parentID = GetRootPartUUID(); |
3163 | position = this.AbsolutePosition; // region local | 3163 | position = AbsolutePosition; // region local |
3164 | regionHandle = this.ParentGroup.Scene.RegionInfo.RegionHandle; | 3164 | regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle; |
3165 | if (triggered) | 3165 | if (triggered) |
3166 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | 3166 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); |
3167 | else | 3167 | else |
@@ -3169,7 +3169,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3169 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) | 3169 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) |
3170 | { | 3170 | { |
3171 | ownerID = prim._ownerID; | 3171 | ownerID = prim._ownerID; |
3172 | objectID = prim.UUID; | 3172 | objectID = prim.ParentGroup.RootPart.UUID; |
3173 | parentID = prim.GetRootPartUUID(); | 3173 | parentID = prim.GetRootPartUUID(); |
3174 | position = prim.AbsolutePosition; // region local | 3174 | position = prim.AbsolutePosition; // region local |
3175 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; | 3175 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; |