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 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation | |
parent | Restoring LoadPlugin as it was before. Justin's last change made it throw. (diff) | |
download | opensim-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/Region/CoreModules/ServiceConnectorsOut/Simulation')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 5 |
2 files changed, 10 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 | */ |