Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData

Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
This commit is contained in:
Justin Clark-Casey (justincc)
2010-03-05 00:54:46 +00:00
parent 8bd114b4df
commit e39fc95659
6 changed files with 31 additions and 24 deletions

View File

@@ -42,6 +42,8 @@ namespace OpenSim
/// </summary>
public class ConfigurationLoader
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Various Config settings the region needs to start
/// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
@@ -60,17 +62,6 @@ namespace OpenSim
/// </summary>
protected NetworkServersInfo m_networkServersInfo;
/// <summary>
/// Console logger
/// </summary>
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
public ConfigurationLoader()
{
}
/// <summary>
/// Loads the region configuration
/// </summary>
@@ -188,7 +179,6 @@ namespace OpenSim
}
// Make sure command line options take precedence
//
m_config.Source.Merge(argvSource);
ReadConfigSettings();