diff options
author | Justin Clark-Casey (justincc) | 2011-10-08 02:15:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-08 02:15:04 +0100 |
commit | 156385f48b2b2829f2d427c72f269406c46019fa (patch) | |
tree | 6ed5f9dc9386761c9229597143b9eeb453891c47 /OpenSim/Services | |
parent | GridService - Region UUID can not be NULL (diff) | |
download | opensim-SC-156385f48b2b2829f2d427c72f269406c46019fa.zip opensim-SC-156385f48b2b2829f2d427c72f269406c46019fa.tar.gz opensim-SC-156385f48b2b2829f2d427c72f269406c46019fa.tar.bz2 opensim-SC-156385f48b2b2829f2d427c72f269406c46019fa.tar.xz |
Tweak to language of last commit in rejecting UUID.Zero in GridService.RegisterRegion()
Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 6 |
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); |