ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the error messages on region region registration. This changes URM

Browse Source 
and region. The non-error case should be compatible, so no version bump.
Untested.
This commit is contained in:
Melanie
2010-01-13 03:08:34 +00:00
parent 1261618216
commit e3a04fcb7b
9 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/GridService/GridService.cs
View File

@@ -62,7 +62,7 @@ namespace OpenSim.Services.GridService
#region IGridService
public bool RegisterRegion(UUID scopeID, GridRegion regionInfos)
public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
{
// This needs better sanity testing. What if regionInfo is registering in
// overlapping coords?
@@ -71,7 +71,7 @@ namespace OpenSim.Services.GridService
{
m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.",
regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
return false;
return "Region overlaps another region";
}
if ((region != null) && (region.RegionID == regionInfos.RegionID) &&
((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
@@ -101,7 +101,7 @@ namespace OpenSim.Services.GridService
{
m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.",
regionInfos.RegionName, regionInfos.RegionID);
return false;
return "Duplicate region name";
}
}
}
@@ -122,7 +122,7 @@ namespace OpenSim.Services.GridService
m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}",
regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
return true;
return String.Empty;
}
public bool DeregisterRegion(UUID regionID)