diff options
| author | Melanie | 2009-09-28 23:03:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 23:03:47 +0100 |
| commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
| tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| parent | Forgot a return statement. (diff) | |
| download | opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz | |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 2a82237..2af98cc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -36,6 +36,7 @@ using OpenSim.Framework; | |||
| 36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
| 37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
| 38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
| 39 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
| 39 | 40 | ||
| 40 | namespace OpenSim.Region.Framework.Scenes | 41 | namespace OpenSim.Region.Framework.Scenes |
| 41 | { | 42 | { |
| @@ -227,7 +228,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 227 | return false; | 228 | return false; |
| 228 | } | 229 | } |
| 229 | 230 | ||
| 230 | public abstract bool OtherRegionUp(RegionInfo thisRegion); | 231 | public abstract void OtherRegionUp(GridRegion otherRegion); |
| 231 | 232 | ||
| 232 | public virtual string GetSimulatorVersion() | 233 | public virtual string GetSimulatorVersion() |
| 233 | { | 234 | { |