diff options
| author | Robert Adams | 2014-01-19 07:38:53 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-19 07:38:53 -0800 |
| commit | f127e4b4ee916a429ef1d9922432869d4138e214 (patch) | |
| tree | be90e6cea8d61088e8380e7027881a8d13f67849 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | varregion: Update Warp3D to properly handle varregions. (diff) | |
| parent | Fix casting error for float type INI file parameter parsing. (diff) | |
| download | opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.zip opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.gz opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.bz2 opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 678f3dc..4dcb99f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
| @@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 174 | 174 | ||
| 175 | #endregion | 175 | #endregion |
| 176 | 176 | ||
| 177 | #region ISimulation | 177 | #region ISimulationService |
| 178 | 178 | ||
| 179 | public IScene GetScene(UUID regionId) | 179 | public IScene GetScene(UUID regionId) |
| 180 | { | 180 | { |
| @@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 353 | return false; | 353 | return false; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | #endregion /* IInterregionComms */ | 356 | #endregion |
| 357 | 357 | ||
| 358 | #region Misc | 358 | #region Misc |
| 359 | 359 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index f45f560..cc01430 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
| @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 146 | 146 | ||
| 147 | #endregion | 147 | #endregion |
| 148 | 148 | ||
| 149 | #region IInterregionComms | 149 | #region ISimulationService |
| 150 | 150 | ||
| 151 | public IScene GetScene(UUID regionId) | 151 | public IScene GetScene(UUID regionId) |
| 152 | { | 152 | { |
| @@ -279,6 +279,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 279 | return false; | 279 | return false; |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | #endregion /* IInterregionComms */ | 282 | #endregion |
| 283 | } | 283 | } |
| 284 | } | 284 | } |