aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISoundModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 8372ddd..f7c6513 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Interfaces
95 /// <param name="radius">Sound radius</param> 95 /// <param name="radius">Sound radius</param>
96 /// <param name="isMaster">Set object to sync master if true</param> 96 /// <param name="isMaster">Set object to sync master if true</param>
97 void LoopSound(UUID objectID, UUID soundID, double gain, 97 void LoopSound(UUID objectID, UUID soundID, double gain,
98 double radius, bool isMaster); 98 double radius, bool isMaster, bool isSlave);
99 99
100 /// <summary> 100 /// <summary>
101 /// Trigger or play an attached sound in this part's inventory. 101 /// Trigger or play an attached sound in this part's inventory.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9527fa5..ba97c47 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -908,14 +908,14 @@ namespace OpenSim.Region.Framework.Scenes
908 } 908 }
909 } 909 }
910 } 910 }
911 911 // PlaySoundMasterPrim no longer in use to remove
912 private SceneObjectPart m_PlaySoundMasterPrim = null; 912 private SceneObjectPart m_PlaySoundMasterPrim = null;
913 public SceneObjectPart PlaySoundMasterPrim 913 public SceneObjectPart PlaySoundMasterPrim
914 { 914 {
915 get { return m_PlaySoundMasterPrim; } 915 get { return m_PlaySoundMasterPrim; }
916 set { m_PlaySoundMasterPrim = value; } 916 set { m_PlaySoundMasterPrim = value; }
917 } 917 }
918 918 // PlaySoundSlavePrims no longer in use to remove
919 private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>(); 919 private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>();
920 public List<SceneObjectPart> PlaySoundSlavePrims 920 public List<SceneObjectPart> PlaySoundSlavePrims
921 { 921 {
@@ -923,6 +923,7 @@ namespace OpenSim.Region.Framework.Scenes
923 set { m_PlaySoundSlavePrims = value; } 923 set { m_PlaySoundSlavePrims = value; }
924 } 924 }
925 925
926 // LoopSoundMasterPrim no longer in use to remove
926 private SceneObjectPart m_LoopSoundMasterPrim = null; 927 private SceneObjectPart m_LoopSoundMasterPrim = null;
927 public SceneObjectPart LoopSoundMasterPrim 928 public SceneObjectPart LoopSoundMasterPrim
928 { 929 {
@@ -930,6 +931,7 @@ namespace OpenSim.Region.Framework.Scenes
930 set { m_LoopSoundMasterPrim = value; } 931 set { m_LoopSoundMasterPrim = value; }
931 } 932 }
932 933
934 // m_LoopSoundSlavePrims no longer in use to remove
933 private List<SceneObjectPart> m_LoopSoundSlavePrims = new List<SceneObjectPart>(); 935 private List<SceneObjectPart> m_LoopSoundSlavePrims = new List<SceneObjectPart>();
934 public List<SceneObjectPart> LoopSoundSlavePrims 936 public List<SceneObjectPart> LoopSoundSlavePrims
935 { 937 {