aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-29 16:05:02 +0000
committerJustin Clark-Casey (justincc)2012-10-29 23:39:01 +0000
commita16ddbee4116fd1234bb2d53598616d5345c09c9 (patch)
tree9cdbe359e24ffcdeead860788b89187df9d3b7a7
parentSianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.St... (diff)
downloadopensim-SC_OLD-a16ddbee4116fd1234bb2d53598616d5345c09c9.zip
opensim-SC_OLD-a16ddbee4116fd1234bb2d53598616d5345c09c9.tar.gz
opensim-SC_OLD-a16ddbee4116fd1234bb2d53598616d5345c09c9.tar.bz2
opensim-SC_OLD-a16ddbee4116fd1234bb2d53598616d5345c09c9.tar.xz
Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModule.cs (renamed from OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs)6
-rw-r--r--bin/OpenSimDefaults.ini5
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index c163e86..1db6519 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -39,8 +39,8 @@ using OpenSim.Region.Framework.Scenes;
39 39
40namespace OpenSim.Region.CoreModules.World.Sound 40namespace OpenSim.Region.CoreModules.World.Sound
41{ 41{
42 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModuleNonShared")] 42 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModule")]
43 public class SoundModuleNonShared : INonSharedRegionModule, ISoundModule 43 public class SoundModule : INonSharedRegionModule, ISoundModule
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger( 45 private static readonly ILog m_log = LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType); 46 MethodBase.GetCurrentMethod().DeclaringType);
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
64 } 64 }
65 else 65 else
66 { 66 {
67 Enabled = config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared"; 67 Enabled = config.GetString("Module", "SoundModule") == "SoundModule";
68 MaxDistance = config.GetFloat("MaxDistance", 100.0f); 68 MaxDistance = config.GetFloat("MaxDistance", 100.0f);
69 } 69 }
70 } 70 }
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index afb6fed..6d1af7c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1688,9 +1688,8 @@ Enabled = False
1688 AutoBackupModuleEnabled = false 1688 AutoBackupModuleEnabled = false
1689 1689
1690[Sounds] 1690[Sounds]
1691 ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModuleNonShared} 1691 ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule}
1692 ;; Currently only INonSharedRegionModule module is implemented. 1692 Module = SoundModule
1693 Module = SoundModuleNonShared
1694 1693
1695 ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} 1694 ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
1696 MaxDistance = 100.0 1695 MaxDistance = 100.0