diff options
author | Melanie | 2010-10-10 22:06:47 +0100 |
---|---|---|
committer | Melanie | 2010-10-10 22:07:36 +0100 |
commit | f2febb89fc8eee4977d965eeb24bd576cc8fb933 (patch) | |
tree | aa60b9d30d030d34c3350e13038dea9cd55f0e94 /OpenSim/Region | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-f2febb89fc8eee4977d965eeb24bd576cc8fb933.zip opensim-SC-f2febb89fc8eee4977d965eeb24bd576cc8fb933.tar.gz opensim-SC-f2febb89fc8eee4977d965eeb24bd576cc8fb933.tar.bz2 opensim-SC-f2febb89fc8eee4977d965eeb24bd576cc8fb933.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.
Diffstat (limited to 'OpenSim/Region')
-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 8140d42..39b109b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2694,7 +2694,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2694 | public void PreloadSound(string sound) | 2694 | public void PreloadSound(string sound) |
2695 | { | 2695 | { |
2696 | // UUID ownerID = OwnerID; | 2696 | // UUID ownerID = OwnerID; |
2697 | UUID objectID = UUID; | 2697 | UUID objectID = ParentGroup.RootPart.UUID; |
2698 | UUID soundID = UUID.Zero; | 2698 | UUID soundID = UUID.Zero; |
2699 | 2699 | ||
2700 | if (!UUID.TryParse(sound, out soundID)) | 2700 | if (!UUID.TryParse(sound, out soundID)) |
@@ -3101,7 +3101,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3101 | volume = 0; | 3101 | volume = 0; |
3102 | 3102 | ||
3103 | UUID ownerID = _ownerID; | 3103 | UUID ownerID = _ownerID; |
3104 | UUID objectID = UUID; | 3104 | UUID objectID = ParentGroup.RootPart.UUID; |
3105 | UUID parentID = GetRootPartUUID(); | 3105 | UUID parentID = GetRootPartUUID(); |
3106 | UUID soundID = UUID.Zero; | 3106 | UUID soundID = UUID.Zero; |
3107 | Vector3 position = AbsolutePosition; // region local | 3107 | Vector3 position = AbsolutePosition; // region local |
@@ -3138,11 +3138,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3138 | else | 3138 | else |
3139 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); | 3139 | soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius); |
3140 | ParentGroup.PlaySoundMasterPrim = this; | 3140 | ParentGroup.PlaySoundMasterPrim = this; |
3141 | ownerID = this._ownerID; | 3141 | ownerID = _ownerID; |
3142 | objectID = this.UUID; | 3142 | objectID = ParentGroup.RootPart.UUID; |
3143 | parentID = this.GetRootPartUUID(); | 3143 | parentID = GetRootPartUUID(); |
3144 | position = this.AbsolutePosition; // region local | 3144 | position = AbsolutePosition; // region local |
3145 | regionHandle = this.ParentGroup.Scene.RegionInfo.RegionHandle; | 3145 | regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle; |
3146 | if (triggered) | 3146 | if (triggered) |
3147 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); | 3147 | soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius); |
3148 | else | 3148 | else |
@@ -3150,7 +3150,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3150 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) | 3150 | foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims) |
3151 | { | 3151 | { |
3152 | ownerID = prim._ownerID; | 3152 | ownerID = prim._ownerID; |
3153 | objectID = prim.UUID; | 3153 | objectID = prim.ParentGroup.RootPart.UUID; |
3154 | parentID = prim.GetRootPartUUID(); | 3154 | parentID = prim.GetRootPartUUID(); |
3155 | position = prim.AbsolutePosition; // region local | 3155 | position = prim.AbsolutePosition; // region local |
3156 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; | 3156 | regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle; |