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

integration
BlueWall 2012-09-06 05:16:39 -04:00
commit 8cac6c8412
2 changed files with 3 additions and 3 deletions

View File

@ -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);
}

View File

@ -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
}
}
}
}