Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-01-23 23:29:25 +00:00
32 changed files with 576 additions and 480 deletions

View File

@@ -38,7 +38,7 @@ namespace OpenSim.Server.Handlers.Simulation
public class SimulationServiceInConnector : ServiceConnector
{
private ISimulationService m_LocalSimulationService;
private IAuthenticationService m_AuthenticationService;
// private IAuthenticationService m_AuthenticationService;
public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
base(config, server, String.Empty)