diff options
author | Melanie | 2010-01-13 03:08:34 +0000 |
---|---|---|
committer | Melanie | 2010-01-13 03:08:34 +0000 |
commit | e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3 (patch) | |
tree | 08b7a8beb35f70cfd8f75400a339da37deed61f4 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.zip opensim-SC-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.gz opensim-SC-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.bz2 opensim-SC-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 '')
4 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index f9cd90f..131febd 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
200 | 200 | ||
201 | #region IGridService | 201 | #region IGridService |
202 | 202 | ||
203 | public bool RegisterRegion(UUID scopeID, GridRegion regionInfo) | 203 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
204 | { | 204 | { |
205 | // Region doesn't exist here. Trying to link remote region | 205 | // Region doesn't exist here. Trying to link remote region |
206 | if (regionInfo.RegionID.Equals(UUID.Zero)) | 206 | if (regionInfo.RegionID.Equals(UUID.Zero)) |
@@ -215,12 +215,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
215 | 215 | ||
216 | // Try get the map image | 216 | // Try get the map image |
217 | m_HypergridServiceConnector.GetMapImage(regionInfo); | 217 | m_HypergridServiceConnector.GetMapImage(regionInfo); |
218 | return true; | 218 | return String.Empty; |
219 | } | 219 | } |
220 | else | 220 | else |
221 | { | 221 | { |
222 | m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")"); | 222 | m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")"); |
223 | return false; | 223 | return "No such region"; |
224 | } | 224 | } |
225 | // Note that these remote regions aren't registered in localBackend, so return null, no local listeners | 225 | // Note that these remote regions aren't registered in localBackend, so return null, no local listeners |
226 | } | 226 | } |
@@ -469,7 +469,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
469 | } | 469 | } |
470 | 470 | ||
471 | // Finally, link it | 471 | // Finally, link it |
472 | if (!RegisterRegion(UUID.Zero, regInfo)) | 472 | if (RegisterRegion(UUID.Zero, regInfo) != String.Empty) |
473 | { | 473 | { |
474 | m_log.Warn("[HGrid]: Unable to link region"); | 474 | m_log.Warn("[HGrid]: Unable to link region"); |
475 | return false; | 475 | return false; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 1c72488..144b5a4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
169 | 169 | ||
170 | #region IGridService | 170 | #region IGridService |
171 | 171 | ||
172 | public bool RegisterRegion(UUID scopeID, GridRegion regionInfo) | 172 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
173 | { | 173 | { |
174 | return m_GridService.RegisterRegion(scopeID, regionInfo); | 174 | return m_GridService.RegisterRegion(scopeID, regionInfo); |
175 | } | 175 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 72c00fc..391e7c8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -135,12 +135,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
135 | 135 | ||
136 | #region IGridService | 136 | #region IGridService |
137 | 137 | ||
138 | public override bool RegisterRegion(UUID scopeID, GridRegion regionInfo) | 138 | public override string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
139 | { | 139 | { |
140 | if (m_LocalGridService.RegisterRegion(scopeID, regionInfo)) | 140 | string msg = m_LocalGridService.RegisterRegion(scopeID, regionInfo); |
141 | |||
142 | if (msg == String.Empty) | ||
141 | return base.RegisterRegion(scopeID, regionInfo); | 143 | return base.RegisterRegion(scopeID, regionInfo); |
142 | 144 | ||
143 | return false; | 145 | return msg; |
144 | } | 146 | } |
145 | 147 | ||
146 | public override bool DeregisterRegion(UUID regionID) | 148 | public override bool DeregisterRegion(UUID regionID) |
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); |