diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index 0bb4713..fe93fa5 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |||
| @@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 41 | private IAuthenticationService m_AuthenticationService; | 41 | private IAuthenticationService m_AuthenticationService; |
| 42 | 42 | ||
| 43 | public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : | 43 | public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : |
| 44 | base(config, server) | 44 | base(config, server, String.Empty) |
| 45 | { | 45 | { |
| 46 | IConfig serverConfig = config.Configs["SimulationService"]; | 46 | IConfig serverConfig = config.Configs["SimulationService"]; |
| 47 | if (serverConfig == null) | 47 | if (serverConfig == null) |