ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-10-12 07:23:08 +01:00
parent cc4b1c69d8 a6c5e00c45
commit 3657cd436c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,8 @@ namespace OpenSim.Services.GridService
public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
{
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";
// This needs better sanity testing. What if regionInfo is registering in
// overlapping coords?
RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);