aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:23:18 +0100
committerMelanie2011-10-12 07:23:18 +0100
commitb716d98e23ff1e1ef2d0fc82c281f9975987e71a (patch)
tree27f70116e262be7ac0faa8cd75140cb359725b96 /OpenSim
parentMerge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge (diff)
parentTweak to language of last commit in rejecting UUID.Zero in GridService.Regist... (diff)
downloadopensim-SC-b716d98e23ff1e1ef2d0fc82c281f9975987e71a.zip
opensim-SC-b716d98e23ff1e1ef2d0fc82c281f9975987e71a.tar.gz
opensim-SC-b716d98e23ff1e1ef2d0fc82c281f9975987e71a.tar.bz2
opensim-SC-b716d98e23ff1e1ef2d0fc82c281f9975987e71a.tar.xz
Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 0aeae67..05cfe5f 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -107,8 +107,10 @@ namespace OpenSim.Services.GridService
107 public string RegisterRegion(UUID scopeID, GridRegion regionInfos) 107 public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
108 { 108 {
109 IConfig gridConfig = m_config.Configs["GridService"]; 109 IConfig gridConfig = m_config.Configs["GridService"];
110 // First Check for invalidate NULL-UUID, if true fast quit 110
111 if (regionInfos.RegionID == UUID.Zero) return "Invalidate RegionID - can not be UUID-NULL"; 111 if (regionInfos.RegionID == UUID.Zero)
112 return "Invalid RegionID - cannot be zero UUID";
113
112 // This needs better sanity testing. What if regionInfo is registering in 114 // This needs better sanity testing. What if regionInfo is registering in
113 // overlapping coords? 115 // overlapping coords?
114 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 116 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);