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/Region | |
| parent | Fixing line endings (diff) | |
| parent | Get the local inner simulation service object to the handler so that there is... (diff) | |
| download | opensim-SC_OLD-3be2b592b21d5e35c4e5d5704acfb780e270b13d.zip opensim-SC_OLD-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.gz opensim-SC_OLD-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.bz2 opensim-SC_OLD-3be2b592b21d5e35c4e5d5704acfb780e270b13d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -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 | */ |