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

Merge branch 'integration' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-09-06 05:16:39 -04:00
parent 02794e152e d51628b0a5
commit 8cac6c8412
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/IntegrationService/IntegrationServiceBase.cs
View File

@ -116,7 +116,7 @@ namespace OpenSim.Services.IntegrationService
registry.Update(); registry.Update();
foreach (IntegrationPlugin cmd in AddinManager.GetExtensionObjects("/OpenSim/IntegrationService")) foreach (IntegrationPlugin cmd in AddinManager.GetExtensionObjects("/OpenSim/IntegrationService"))
{ {
m_log.DebugFormat("[INTEGRATION SERVICE]: Processing _Addin {0}", cmd.PluginName); m_log.DebugFormat("[INTEGRATION SERVICE]: Processing Addin {0}", cmd.PluginName);
LoadingPlugin(cmd); LoadingPlugin(cmd);
} }

2
OpenSim/Services/IntegrationService/IntegrationUtils.cs
View File

@ -132,7 +132,7 @@ namespace OpenSim.Services.IntegrationService
public static IConfigSource LoadInitialConfig(string url) public static IConfigSource LoadInitialConfig(string url)
{ {
IConfigSource source = new XmlConfigSource(); IConfigSource source = new XmlConfigSource();
m_log.InfoFormat("[CONFIG]: {0} is a http:// URI, fetching ...", url); m_log.InfoFormat("[CONFIG]: {0} is a http:// URI, fetching ...", url);
// The ini file path is a http URI // The ini file path is a http URI
// Try to read it // Try to read it