diff options
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index a500593..7749c37 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Services.GridService | |||
62 | 62 | ||
63 | #region IGridService | 63 | #region IGridService |
64 | 64 | ||
65 | public bool RegisterRegion(UUID scopeID, GridRegion regionInfos) | 65 | public string RegisterRegion(UUID scopeID, GridRegion regionInfos) |
66 | { | 66 | { |
67 | // This needs better sanity testing. What if regionInfo is registering in | 67 | // This needs better sanity testing. What if regionInfo is registering in |
68 | // overlapping coords? | 68 | // overlapping coords? |
@@ -71,7 +71,7 @@ namespace OpenSim.Services.GridService | |||
71 | { | 71 | { |
72 | m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", | 72 | m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", |
73 | regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); | 73 | regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); |
74 | return false; | 74 | return "Region overlaps another region"; |
75 | } | 75 | } |
76 | if ((region != null) && (region.RegionID == regionInfos.RegionID) && | 76 | if ((region != null) && (region.RegionID == regionInfos.RegionID) && |
77 | ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) | 77 | ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) |
@@ -101,7 +101,7 @@ namespace OpenSim.Services.GridService | |||
101 | { | 101 | { |
102 | m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.", | 102 | m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.", |
103 | regionInfos.RegionName, regionInfos.RegionID); | 103 | regionInfos.RegionName, regionInfos.RegionID); |
104 | return false; | 104 | return "Duplicate region name"; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | } | 107 | } |
@@ -122,7 +122,7 @@ namespace OpenSim.Services.GridService | |||
122 | m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", | 122 | m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", |
123 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY); | 123 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY); |
124 | 124 | ||
125 | return true; | 125 | return String.Empty; |
126 | } | 126 | } |
127 | 127 | ||
128 | public bool DeregisterRegion(UUID regionID) | 128 | public bool DeregisterRegion(UUID regionID) |