aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:23:08 +0100
committerMelanie2011-10-12 07:23:08 +0100
commit3657cd436c2d6b19824d26b0656c22e01d514ab5 (patch)
tree048f74b296f540d4a54a1e8c9b375a74eba0dea7 /OpenSim/Services/GridService
parentMerge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge (diff)
parentGridService - Region UUID can not be NULL (diff)
downloadopensim-SC_OLD-3657cd436c2d6b19824d26b0656c22e01d514ab5.zip
opensim-SC_OLD-3657cd436c2d6b19824d26b0656c22e01d514ab5.tar.gz
opensim-SC_OLD-3657cd436c2d6b19824d26b0656c22e01d514ab5.tar.bz2
opensim-SC_OLD-3657cd436c2d6b19824d26b0656c22e01d514ab5.tar.xz
Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/GridService.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 0a4372a..0aeae67 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -107,6 +107,8 @@ 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
111 if (regionInfos.RegionID == UUID.Zero) return "Invalidate RegionID - can not be UUID-NULL";
110 // This needs better sanity testing. What if regionInfo is registering in 112 // This needs better sanity testing. What if regionInfo is registering in
111 // overlapping coords? 113 // overlapping coords?
112 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 114 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);