diff options
| author | Robert Adams | 2014-07-20 10:34:09 -0700 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-08-02 00:55:47 +0100 |
| commit | 01d13b4ad7d0cf1a235fd8041b0c009ede7e5d8a (patch) | |
| tree | 18f061590352566758ad9837b1fdd2609e3f41bc /OpenSim/Data | |
| parent | minor: remove long unused RegionInfo.ignoreIncomingConfiguration (diff) | |
| download | opensim-SC_OLD-01d13b4ad7d0cf1a235fd8041b0c009ede7e5d8a.zip opensim-SC_OLD-01d13b4ad7d0cf1a235fd8041b0c009ede7e5d8a.tar.gz opensim-SC_OLD-01d13b4ad7d0cf1a235fd8041b0c009ede7e5d8a.tar.bz2 opensim-SC_OLD-01d13b4ad7d0cf1a235fd8041b0c009ede7e5d8a.tar.xz | |
Add code to GridService to check for overlapping of varregions
when registering a new region.
Adds parameter "[GridService]SuppressVarRegionOverlapCheckOnRegistration=false"
that can be turned on to suppress the error check if a simulator's database
has old regions that overlap.
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/IRegionData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs index 50433ba..ca9b327 100644 --- a/OpenSim/Data/IRegionData.cs +++ b/OpenSim/Data/IRegionData.cs | |||
| @@ -52,12 +52,12 @@ namespace OpenSim.Data | |||
| 52 | public int sizeY; | 52 | public int sizeY; |
| 53 | 53 | ||
| 54 | /// <summary> | 54 | /// <summary> |
| 55 | /// Return the x-coordinate of this region. | 55 | /// Return the x-coordinate of this region in region units. |
| 56 | /// </summary> | 56 | /// </summary> |
| 57 | public int coordX { get { return (int)Util.WorldToRegionLoc((uint)posX); } } | 57 | public int coordX { get { return (int)Util.WorldToRegionLoc((uint)posX); } } |
| 58 | 58 | ||
| 59 | /// <summary> | 59 | /// <summary> |
| 60 | /// Return the y-coordinate of this region. | 60 | /// Return the y-coordinate of this region in region units. |
| 61 | /// </summary> | 61 | /// </summary> |
| 62 | public int coordY { get { return (int)Util.WorldToRegionLoc((uint)posY); } } | 62 | public int coordY { get { return (int)Util.WorldToRegionLoc((uint)posY); } } |
| 63 | 63 | ||