aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
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/Services
parentRestoring LoadPlugin as it was before. Justin's last change made it throw. (diff)
downloadopensim-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 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs5
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs1
2 files changed, 6 insertions, 0 deletions
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