aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-01-14 01:20:07 +0000
committerMelanie2010-01-14 01:20:07 +0000
commitf0152790cf5a330986bec80bb274098d45c721c7 (patch)
tree913343c67896715c071120d18ffd5ebe093eba50 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' into careminster (diff)
parentFix a bad error message (diff)
downloadopensim-SC-f0152790cf5a330986bec80bb274098d45c721c7.zip
opensim-SC-f0152790cf5a330986bec80bb274098d45c721c7.tar.gz
opensim-SC-f0152790cf5a330986bec80bb274098d45c721c7.tar.bz2
opensim-SC-f0152790cf5a330986bec80bb274098d45c721c7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8ac4bc4..db21bf9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1589,9 +1589,9 @@ namespace OpenSim.Region.Framework.Scenes
1589 //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo); 1589 //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
1590 1590
1591 GridRegion region = new GridRegion(RegionInfo); 1591 GridRegion region = new GridRegion(RegionInfo);
1592 bool success = GridService.RegisterRegion(RegionInfo.ScopeID, region); 1592 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
1593 if (!success) 1593 if (error != String.Empty)
1594 throw new Exception("Can't register with grid"); 1594 throw new Exception(error);
1595 1595
1596 m_sceneGridService.SetScene(this); 1596 m_sceneGridService.SetScene(this);
1597 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo); 1597 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);