diff options
| author | Melanie | 2012-05-13 01:24:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-13 01:24:01 +0100 |
| commit | e2dc04586afff4df24b82892728246a0eeed35f9 (patch) | |
| tree | 80124f4f0454d96f5df3ae91e045ff2aebdc1553 /OpenSim/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix mono compiler warning. (diff) | |
| download | opensim-SC_OLD-e2dc04586afff4df24b82892728246a0eeed35f9.zip opensim-SC_OLD-e2dc04586afff4df24b82892728246a0eeed35f9.tar.gz opensim-SC_OLD-e2dc04586afff4df24b82892728246a0eeed35f9.tar.bz2 opensim-SC_OLD-e2dc04586afff4df24b82892728246a0eeed35f9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index dc24418..78f9434 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common | |||
| 66 | private AgentCircuitManager m_acm = new AgentCircuitManager(); | 66 | private AgentCircuitManager m_acm = new AgentCircuitManager(); |
| 67 | private ISimulationDataService m_simDataService | 67 | private ISimulationDataService m_simDataService |
| 68 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); | 68 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); |
| 69 | private IEstateDataService m_estateDataService; | 69 | private IEstateDataService m_estateDataService = null; |
| 70 | 70 | ||
| 71 | private LocalAssetServicesConnector m_assetService; | 71 | private LocalAssetServicesConnector m_assetService; |
| 72 | private LocalAuthenticationServicesConnector m_authenticationService; | 72 | private LocalAuthenticationServicesConnector m_authenticationService; |