aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-14 16:52:12 +0000
committerJustin Clarke Casey2009-01-14 16:52:12 +0000
commit2a5f060ed8c523e42ab6f747f03f27ab78ea3a4c (patch)
treeed06424413801134b0d3bc95aff7b27586ac41b1 /OpenSim
parent* Apply http://opensimulator.org/mantis/view.php?id=2995 (diff)
downloadopensim-SC_OLD-2a5f060ed8c523e42ab6f747f03f27ab78ea3a4c.zip
opensim-SC_OLD-2a5f060ed8c523e42ab6f747f03f27ab78ea3a4c.tar.gz
opensim-SC_OLD-2a5f060ed8c523e42ab6f747f03f27ab78ea3a4c.tar.bz2
opensim-SC_OLD-2a5f060ed8c523e42ab6f747f03f27ab78ea3a4c.tar.xz
* Fix typo which meant that RestComms was never enabled if you explicitly enabled it
* In fact, it would only be activated if there was no [Communications] section at all (which would be the case for most people with existing region setups unless they specifically added it in * This fix means that enabling inter-region rest comms is now the default
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 7a0bb9b..82ed5d4 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -70,10 +70,12 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
70 { 70 {
71 initialized = true; 71 initialized = true;
72 IConfig startupConfig = config.Configs["Communications"]; 72 IConfig startupConfig = config.Configs["Communications"];
73 if ((startupConfig == null) || 73
74 (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms")) 74 if ((startupConfig == null)
75 || (startupConfig != null)
76 && (startupConfig.GetString("InterregionComms", "RESTComms") == "RESTComms"))
75 { 77 {
76 m_log.Debug("[REST COMMS]: Enabling InterregionComms RESTComms module"); 78 m_log.Info("[REST COMMS]: Enabling InterregionComms RESTComms module");
77 m_enabled = true; 79 m_enabled = true;
78 InitOnce(scene); 80 InitOnce(scene);
79 } 81 }