aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-03-15 20:32:36 -0700
committerDiva Canto2010-03-15 20:32:36 -0700
commit45ef3e9987def8385174c332fc56c90b0ba3fef8 (patch)
tree19009d94194ee94ac691a84a4b7c271d6ffaf648 /OpenSim/Server
parentRestoring LoadPlugin as it was before. Justin's last change made it throw. (diff)
downloadopensim-SC_OLD-45ef3e9987def8385174c332fc56c90b0ba3fef8.zip
opensim-SC_OLD-45ef3e9987def8385174c332fc56c90b0ba3fef8.tar.gz
opensim-SC_OLD-45ef3e9987def8385174c332fc56c90b0ba3fef8.tar.bz2
opensim-SC_OLD-45ef3e9987def8385174c332fc56c90b0ba3fef8.tar.xz
Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs1
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"));