Merge branch 'integration' of /home/opensim/var/repo/opensim
commit
8cac6c8412
|
@ -116,7 +116,7 @@ namespace OpenSim.Services.IntegrationService
|
|||
registry.Update();
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ namespace OpenSim.Services.IntegrationService
|
|||
public static IConfigSource LoadInitialConfig(string url)
|
||||
{
|
||||
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
|
||||
// Try to read it
|
||||
|
@ -158,4 +158,4 @@ namespace OpenSim.Services.IntegrationService
|
|||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue