From a09cba6da363606f0e2d63118b63f5b05232c452 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Mon, 29 Oct 2012 16:17:18 +0000 Subject: [PATCH] refactoring to use assembly:classname style of configuration --- OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 5 ++++- bin/OpenSimDefaults.ini | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 1db65193f1..513a8f5385 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System; +using System.IO; using System.Collections.Generic; using System.Reflection; @@ -64,7 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Sound } else { - Enabled = config.GetString("Module", "SoundModule") == "SoundModule"; + Enabled = config.GetString("Module", "OpenSim.Region.CoreModules.dll:SoundModule") == + Path.GetFileName(Assembly.GetExecutingAssembly().Location) + + ":" + MethodBase.GetCurrentMethod().DeclaringType.Name; MaxDistance = config.GetFloat("MaxDistance", 100.0f); } } diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 6d1af7ce1a..fa284bdef1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1688,8 +1688,8 @@ Enabled = False AutoBackupModuleEnabled = false [Sounds] - ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule} - Module = SoundModule + ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule} + Module = OpenSim.Region.CoreModules.dll:SoundModule ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} MaxDistance = 100.0