diff options
author | diva | 2008-12-30 01:21:13 +0000 |
---|---|---|
committer | diva | 2008-12-30 01:21:13 +0000 |
commit | eaf8066700bc48259d509282fd6362ca697b49ad (patch) | |
tree | 650513aaa7c0e403da8a60695cb9e63fa973556c /OpenSim/Region/Environment/Modules/Communications/REST | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-eaf8066700bc48259d509282fd6362ca697b49ad.zip opensim-SC-eaf8066700bc48259d509282fd6362ca697b49ad.tar.gz opensim-SC-eaf8066700bc48259d509282fd6362ca697b49ad.tar.bz2 opensim-SC-eaf8066700bc48259d509282fd6362ca697b49ad.tar.xz |
Making the default choice for InterregionComms work, and removing an unnecessary console debug message.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Communications/REST')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs index a94ca8b..1599d75 100644 --- a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST | |||
55 | IConfig startupConfig = config.Configs["Communications"]; | 55 | IConfig startupConfig = config.Configs["Communications"]; |
56 | if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms")) | 56 | if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms")) |
57 | { | 57 | { |
58 | m_log.Debug("[HGREST COMMS]: Enabling InterregionComms HGRESTComms module"); | ||
58 | m_enabled = true; | 59 | m_enabled = true; |
59 | InitOnce(scene); | 60 | InitOnce(scene); |
60 | } | 61 | } |
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs index 022f635..77aad6b 100644 --- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs | |||
@@ -68,8 +68,10 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST | |||
68 | { | 68 | { |
69 | initialized = true; | 69 | initialized = true; |
70 | IConfig startupConfig = config.Configs["Communications"]; | 70 | IConfig startupConfig = config.Configs["Communications"]; |
71 | if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms")) | 71 | if ((startupConfig == null) || |
72 | (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms")) | ||
72 | { | 73 | { |
74 | m_log.Debug("[REST COMMS]: Enabling InterregionComms RESTComms module"); | ||
73 | m_enabled = true; | 75 | m_enabled = true; |
74 | InitOnce(scene); | 76 | InitOnce(scene); |
75 | } | 77 | } |