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/Services/Connectors | |
| 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/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 5 |
1 files changed, 5 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() |