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.

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;
 
 namespace OpenSim.Region.CoreModules.World.Sound
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModuleNonShared")]
-    public class SoundModuleNonShared : INonSharedRegionModule, ISoundModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModule")]
+    public class SoundModule : INonSharedRegionModule, ISoundModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
             }
             else
             {
-                Enabled = config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared";
+                Enabled = config.GetString("Module", "SoundModule") == "SoundModule";
                 MaxDistance = config.GetFloat("MaxDistance", 100.0f);
             }
         }
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
         AutoBackupModuleEnabled = false
 
 [Sounds]
-        ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModuleNonShared}
-        ;; Currently only INonSharedRegionModule module is implemented.
-        Module = SoundModuleNonShared
+        ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule}
+        Module = SoundModule
 
         ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
         MaxDistance = 100.0