diff options
| author | Melanie | 2011-01-23 23:29:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-23 23:29:25 +0000 |
| commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
| tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Server/Handlers/Simulation | |
| parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
| parent | Fixes mantis #5343 (diff) | |
| download | opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 50d6fb2..f33eda7 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 38 | public class SimulationServiceInConnector : ServiceConnector | 38 | public class SimulationServiceInConnector : ServiceConnector |
| 39 | { | 39 | { |
| 40 | private ISimulationService m_LocalSimulationService; | 40 | private ISimulationService m_LocalSimulationService; |
| 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, String.Empty) | 44 | base(config, server, String.Empty) |