diff options
author | Diva Canto | 2010-03-15 20:32:36 -0700 |
---|---|---|
committer | Diva Canto | 2010-03-15 20:32:36 -0700 |
commit | 45ef3e9987def8385174c332fc56c90b0ba3fef8 (patch) | |
tree | 19009d94194ee94ac691a84a4b7c271d6ffaf648 | |
parent | Restoring LoadPlugin as it was before. Justin's last change made it throw. (diff) | |
download | opensim-SC-45ef3e9987def8385174c332fc56c90b0ba3fef8.zip opensim-SC-45ef3e9987def8385174c332fc56c90b0ba3fef8.tar.gz opensim-SC-45ef3e9987def8385174c332fc56c90b0ba3fef8.tar.bz2 opensim-SC-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 '')
5 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 783d606..e32dbb3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -166,6 +166,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
166 | return m_sceneList[0]; | 166 | return m_sceneList[0]; |
167 | } | 167 | } |
168 | 168 | ||
169 | public ISimulationService GetInnerService() | ||
170 | { | ||
171 | return this; | ||
172 | } | ||
173 | |||
169 | /** | 174 | /** |
170 | * Agent-related communications | 175 | * Agent-related communications |
171 | */ | 176 | */ |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 4d82a05..9e8454f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -156,6 +156,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
156 | return m_localBackend.GetScene(handle); | 156 | return m_localBackend.GetScene(handle); |
157 | } | 157 | } |
158 | 158 | ||
159 | public ISimulationService GetInnerService() | ||
160 | { | ||
161 | return m_localBackend; | ||
162 | } | ||
163 | |||
159 | /** | 164 | /** |
160 | * Agent-related communications | 165 | * Agent-related communications |
161 | */ | 166 | */ |
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")); |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index d3be1a8..ff0dd7e 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -63,6 +63,11 @@ namespace OpenSim.Services.Connectors.Simulation | |||
63 | return null; | 63 | return null; |
64 | } | 64 | } |
65 | 65 | ||
66 | public ISimulationService GetInnerService() | ||
67 | { | ||
68 | return null; | ||
69 | } | ||
70 | |||
66 | #region Agents | 71 | #region Agents |
67 | 72 | ||
68 | protected virtual string AgentPath() | 73 | protected virtual string AgentPath() |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index ec24d90..67d7cbe 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -36,6 +36,7 @@ namespace OpenSim.Services.Interfaces | |||
36 | public interface ISimulationService | 36 | public interface ISimulationService |
37 | { | 37 | { |
38 | IScene GetScene(ulong regionHandle); | 38 | IScene GetScene(ulong regionHandle); |
39 | ISimulationService GetInnerService(); | ||
39 | 40 | ||
40 | #region Agents | 41 | #region Agents |
41 | 42 | ||