From e0b5a3cd900d8ad29cdb7d43415b069d5484a424 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Tue, 16 Oct 2012 15:15:03 +0100
Subject: tweaking configuration logic so that the INonSharedRegionModule will
 load by default

---
 .../Region/CoreModules/World/Sound/SoundModuleNonShared.cs  | 13 +++++++++----
 bin/OpenSimDefaults.ini                                     |  8 ++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
index ac7f7b4..68bd413 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
@@ -58,10 +58,15 @@ namespace OpenSim.Region.CoreModules.World.Sound
             IConfig config = configSource.Configs["Sounds"];
 
             if (config == null)
-                return;
-
-            Enabled = config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared";
-            MaxDistance = config.GetFloat("MaxDistance", 100.0f);
+            {
+                Enabled = true;
+                MaxDistance = 100.0f;
+            }
+            else
+            {
+                Enabled = config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared";
+                MaxDistance = config.GetFloat("MaxDistance", 100.0f);
+            }
         }
 
         public void AddRegion(Scene scene) { }
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index dffc0ac..afb6fed 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1687,5 +1687,13 @@ Enabled = False
 	;; default is module is disabled at the top level
 	AutoBackupModuleEnabled = false
 
+[Sounds]
+	;; {Module} {} {Implementation of ISoundModule to use.} {SoundModuleNonShared}
+	;; Currently only INonSharedRegionModule module is implemented.
+	Module = SoundModuleNonShared
+
+	;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+	MaxDistance = 100.0
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
-- 
cgit v1.1