diff options
| author | John Hurliman | 2010-03-15 20:54:57 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-15 20:54:57 -0700 |
| commit | 3be2b592b21d5e35c4e5d5704acfb780e270b13d (patch) | |
| tree | 4d46405e951c7dcf11ec16180f3c2fdf8bbaed79 /OpenSim/Server/Handlers/Simulation | |
| parent | Fixing line endings (diff) | |
| parent | Get the local inner simulation service object to the handler so that there is... (diff) | |
| download | opensim-SC-3be2b592b21d5e35c4e5d5704acfb780e270b13d.zip opensim-SC-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.gz opensim-SC-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.bz2 opensim-SC-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
| -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")); |