OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge

avinationmerge
Melanie 2011-10-12 07:23:18 +01:00
parent 3657cd436c 156385f48b
commit b716d98e23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,8 +107,10 @@ namespace OpenSim.Services.GridService
public string RegisterRegion(UUID scopeID, GridRegion regionInfos) public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
{ {
IConfig gridConfig = m_config.Configs["GridService"]; IConfig gridConfig = m_config.Configs["GridService"];
// First Check for invalidate NULL-UUID, if true fast quit
if (regionInfos.RegionID == UUID.Zero) return "Invalidate RegionID - can not be UUID-NULL"; if (regionInfos.RegionID == UUID.Zero)
return "Invalid RegionID - cannot be zero UUID";
// This needs better sanity testing. What if regionInfo is registering in // This needs better sanity testing. What if regionInfo is registering in
// overlapping coords? // overlapping coords?
RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);