aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-01-13 03:08:34 +0000
committerMelanie2010-01-13 03:08:34 +0000
commite3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3 (patch)
tree08b7a8beb35f70cfd8f75400a339da37deed61f4 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.zip
opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.gz
opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.bz2
opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.xz
Change the error messages on region region registration. This changes URM
and region. The non-error case should be compatible, so no version bump. Untested.
Diffstat (limited to 'OpenSim/Region/Framework')
-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 bc9301b..234554e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1562,9 +1562,9 @@ namespace OpenSim.Region.Framework.Scenes
1562 //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo); 1562 //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
1563 1563
1564 GridRegion region = new GridRegion(RegionInfo); 1564 GridRegion region = new GridRegion(RegionInfo);
1565 bool success = GridService.RegisterRegion(RegionInfo.ScopeID, region); 1565 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
1566 if (!success) 1566 if (error != String.Empty)
1567 throw new Exception("Can't register with grid"); 1567 throw new Exception(error);
1568 1568
1569 m_sceneGridService.SetScene(this); 1569 m_sceneGridService.SetScene(this);
1570 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo); 1570 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);