Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.7.4.1
BlueWall 2012-05-13 17:39:05 -04:00
commit b80db81cdd
1 changed files with 1 additions and 1 deletions

View File

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