aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-05-13 17:39:05 -0400
committerBlueWall2012-05-13 17:39:05 -0400
commitb80db81cddf888ff868f5423fbbe1e17c65d2577 (patch)
tree5a8b095f4b3078ace342e70a50477e7c3f7bc4d3 /OpenSim
parentAdd configurable SpawnPointRouting (diff)
parentFix mono compiler warning. (diff)
downloadopensim-SC_OLD-b80db81cddf888ff868f5423fbbe1e17c65d2577.zip
opensim-SC_OLD-b80db81cddf888ff868f5423fbbe1e17c65d2577.tar.gz
opensim-SC_OLD-b80db81cddf888ff868f5423fbbe1e17c65d2577.tar.bz2
opensim-SC_OLD-b80db81cddf888ff868f5423fbbe1e17c65d2577.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs2
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;