diff options
| author | Melanie | 2009-09-28 23:03:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 23:03:47 +0100 |
| commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
| tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Tests | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| parent | Forgot a return statement. (diff) | |
| download | opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz | |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Clients/Grid/GridClient.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs index 941406e..ccda661 100644 --- a/OpenSim/Tests/Clients/Grid/GridClient.cs +++ b/OpenSim/Tests/Clients/Grid/GridClient.cs | |||
| @@ -28,7 +28,7 @@ namespace OpenSim.Tests.Clients.GridClient | |||
| 28 | new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); | 28 | new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); |
| 29 | log4net.Config.BasicConfigurator.Configure(consoleAppender); | 29 | log4net.Config.BasicConfigurator.Configure(consoleAppender); |
| 30 | 30 | ||
| 31 | string serverURI = "http://127.0.0.1:8002"; | 31 | string serverURI = "http://127.0.0.1:8001"; |
| 32 | GridServicesConnector m_Connector = new GridServicesConnector(serverURI); | 32 | GridServicesConnector m_Connector = new GridServicesConnector(serverURI); |
| 33 | 33 | ||
| 34 | GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000); | 34 | GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000); |
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index 4313c96..de73663 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
| @@ -65,8 +65,6 @@ namespace OpenSim.Tests.Common.Mock | |||
| 65 | m_userService = lus; | 65 | m_userService = lus; |
| 66 | m_userAdminService = lus; | 66 | m_userAdminService = lus; |
| 67 | 67 | ||
| 68 | LocalBackEndServices gs = new LocalBackEndServices(); | ||
| 69 | m_gridService = gs; | ||
| 70 | } | 68 | } |
| 71 | } | 69 | } |
| 72 | } | 70 | } |