Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
b80db81cdd
|
@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common
|
||||||
private AgentCircuitManager m_acm = new AgentCircuitManager();
|
private AgentCircuitManager m_acm = new AgentCircuitManager();
|
||||||
private ISimulationDataService m_simDataService
|
private ISimulationDataService m_simDataService
|
||||||
= OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
|
= OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
|
||||||
private IEstateDataService m_estateDataService;
|
private IEstateDataService m_estateDataService = null;
|
||||||
|
|
||||||
private LocalAssetServicesConnector m_assetService;
|
private LocalAssetServicesConnector m_assetService;
|
||||||
private LocalAuthenticationServicesConnector m_authenticationService;
|
private LocalAuthenticationServicesConnector m_authenticationService;
|
||||||
|
|
Loading…
Reference in New Issue