aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordiva2008-12-30 01:21:13 +0000
committerdiva2008-12-30 01:21:13 +0000
commiteaf8066700bc48259d509282fd6362ca697b49ad (patch)
tree650513aaa7c0e403da8a60695cb9e63fa973556c /OpenSim/Region
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-eaf8066700bc48259d509282fd6362ca697b49ad.zip
opensim-SC_OLD-eaf8066700bc48259d509282fd6362ca697b49ad.tar.gz
opensim-SC_OLD-eaf8066700bc48259d509282fd6362ca697b49ad.tar.bz2
opensim-SC_OLD-eaf8066700bc48259d509282fd6362ca697b49ad.tar.xz
Making the default choice for InterregionComms work, and removing an unnecessary console debug message.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs4
3 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
index dc2e3de..781bf1c 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
@@ -64,9 +64,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
64 { 64 {
65 IConfig startupConfig = config.Configs["Communications"]; 65 IConfig startupConfig = config.Configs["Communications"];
66 66
67 if ((startupConfig == null) || 67 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
68 (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms")) 68 {
69 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
69 m_enabled = true; 70 m_enabled = true;
71 }
70 } 72 }
71 73
72 if (!m_enabled) 74 if (!m_enabled)
@@ -131,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
131 } 133 }
132 } 134 }
133 } 135 }
134 m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); 136 //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
135 return false; 137 return false;
136 } 138 }
137 139
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 }