aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-29 16:17:18 +0000
committerJustin Clark-Casey (justincc)2012-10-29 23:39:01 +0000
commita09cba6da363606f0e2d63118b63f5b05232c452 (patch)
tree0afdf9a94b2dd2d1683b1a4b41d75c2979204825
parentRenaming module back to SoundModule as the hypothetical plan was to make anot... (diff)
downloadopensim-SC-a09cba6da363606f0e2d63118b63f5b05232c452.zip
opensim-SC-a09cba6da363606f0e2d63118b63f5b05232c452.tar.gz
opensim-SC-a09cba6da363606f0e2d63118b63f5b05232c452.tar.bz2
opensim-SC-a09cba6da363606f0e2d63118b63f5b05232c452.tar.xz
refactoring to use assembly:classname style of configuration
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModule.cs5
-rw-r--r--bin/OpenSimDefaults.ini4
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 1db6519..513a8f5 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.IO;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
30 31
@@ -64,7 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Sound
64 } 65 }
65 else 66 else
66 { 67 {
67 Enabled = config.GetString("Module", "SoundModule") == "SoundModule"; 68 Enabled = config.GetString("Module", "OpenSim.Region.CoreModules.dll:SoundModule") ==
69 Path.GetFileName(Assembly.GetExecutingAssembly().Location)
70 + ":" + MethodBase.GetCurrentMethod().DeclaringType.Name;
68 MaxDistance = config.GetFloat("MaxDistance", 100.0f); 71 MaxDistance = config.GetFloat("MaxDistance", 100.0f);
69 } 72 }
70 } 73 }
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6d1af7c..fa284bd 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1688,8 +1688,8 @@ Enabled = False
1688 AutoBackupModuleEnabled = false 1688 AutoBackupModuleEnabled = false
1689 1689
1690[Sounds] 1690[Sounds]
1691 ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule} 1691 ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
1692 Module = SoundModule 1692 Module = OpenSim.Region.CoreModules.dll:SoundModule
1693 1693
1694 ;; {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}
1695 MaxDistance = 100.0 1695 MaxDistance = 100.0