OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making the default choice for InterregionComms work, and removing an unnecessary console debug message.

0.6.2-post-fixes
diva 2008-12-30 01:21:13 +00:00
parent 2be0f7a6f0
commit eaf8066700
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
View File

@ -64,9 +64,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
{ {
IConfig startupConfig = config.Configs["Communications"]; IConfig startupConfig = config.Configs["Communications"];
if ((startupConfig == null) || if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
(startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms")) {
m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
m_enabled = true; m_enabled = true;
}
} }
if (!m_enabled) if (!m_enabled)
@ -131,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
} }
} }
} }
m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
return false; return false;
} }

1
OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
View File

@ -55,6 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
IConfig startupConfig = config.Configs["Communications"]; IConfig startupConfig = config.Configs["Communications"];
if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms")) if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
{ {
m_log.Debug("[HGREST COMMS]: Enabling InterregionComms HGRESTComms module");
m_enabled = true; m_enabled = true;
InitOnce(scene); InitOnce(scene);
} }

4
OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
View File

@ -68,8 +68,10 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
{ {
initialized = true; initialized = true;
IConfig startupConfig = config.Configs["Communications"]; IConfig startupConfig = config.Configs["Communications"];
if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms")) if ((startupConfig == null) ||
(startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms"))
{ {
m_log.Debug("[REST COMMS]: Enabling InterregionComms RESTComms module");
m_enabled = true; m_enabled = true;
InitOnce(scene); InitOnce(scene);
} }