diff options
author | Justin Clarke Casey | 2008-05-12 16:57:56 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-12 16:57:56 +0000 |
commit | d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2 (patch) | |
tree | c7e3a49e79878e4ea2958ee6ce188b2f0559be80 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Minor: Change 'delete region' message to region logout message (diff) | |
download | opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.zip opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.gz opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.bz2 opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.xz |
* If a region running in grid mode fails to login to the grid service, startup will now terminate instead of carrying on (and thus burying the error message)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e8a6c45..e18c467 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -924,13 +924,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
924 | } | 924 | } |
925 | } | 925 | } |
926 | 926 | ||
927 | /// <summary> | ||
928 | /// Register this region with a grid service | ||
929 | /// </summary> | ||
930 | /// <exception cref="System.Exception">Thrown if registration of the region itself fails.</exception> | ||
927 | public void RegisterRegionWithGrid() | 931 | public void RegisterRegionWithGrid() |
928 | { | 932 | { |
929 | RegisterCommsEvents(); | 933 | RegisterCommsEvents(); |
934 | |||
930 | // These two 'commands' *must be* next to each other or sim rebooting fails. | 935 | // These two 'commands' *must be* next to each other or sim rebooting fails. |
931 | m_sceneGridService.RegisterRegion(RegionInfo); | 936 | m_sceneGridService.RegisterRegion(RegionInfo); |
932 | m_sceneGridService.InformNeighborsThatRegionisUp(RegionInfo); | 937 | m_sceneGridService.InformNeighborsThatRegionisUp(RegionInfo); |
938 | |||
933 | Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings(); | 939 | Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings(); |
940 | |||
934 | if (dGridSettings.ContainsKey("allow_forceful_banlines")) | 941 | if (dGridSettings.ContainsKey("allow_forceful_banlines")) |
935 | { | 942 | { |
936 | if (dGridSettings["allow_forceful_banlines"] != "TRUE") | 943 | if (dGridSettings["allow_forceful_banlines"] != "TRUE") |