diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 5 |
2 files changed, 12 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") |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 91bbdb7..5ef4a7d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -84,6 +84,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
84 | m_commsProvider.InterRegion.rdebugRegionName = _debugRegionName; | 84 | m_commsProvider.InterRegion.rdebugRegionName = _debugRegionName; |
85 | } | 85 | } |
86 | 86 | ||
87 | /// <summary> | ||
88 | /// Register a region with the grid | ||
89 | /// </summary> | ||
90 | /// <param name="regionInfos"></param> | ||
91 | /// <exception cref="System.Exception">Thrown if region registration fails.</exception> | ||
87 | public void RegisterRegion(RegionInfo regionInfos) | 92 | public void RegisterRegion(RegionInfo regionInfos) |
88 | { | 93 | { |
89 | m_regionInfo = regionInfos; | 94 | m_regionInfo = regionInfos; |