diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Server/Handlers/Simulation | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
| -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) |