diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Server/Handlers | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server/Handlers')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index 55a575c..50d6fb2 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |||
| @@ -55,6 +55,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 55 | 55 | ||
| 56 | //Object[] args = new Object[] { config }; | 56 | //Object[] args = new Object[] { config }; |
| 57 | m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>(); | 57 | m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>(); |
| 58 | m_LocalSimulationService = m_LocalSimulationService.GetInnerService(); | ||
| 58 | //ServerUtils.LoadPlugin<ISimulationService>(simService, args); | 59 | //ServerUtils.LoadPlugin<ISimulationService>(simService, args); |
| 59 | 60 | ||
| 60 | //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); | 61 | //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); |