aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorRobert Adams2014-07-20 10:34:09 -0700
committerRobert Adams2014-07-20 10:34:09 -0700
commitaa8b44c001445e0fc72ec5fe68a79bbd970e8753 (patch)
tree7ffd96857319e1c23b6ae92d3e3e4cb0a4aa6c61 /OpenSim/Data
parentBulletSim: Modify first and default vehicle vertical attractor to be feature ... (diff)
downloadopensim-SC_OLD-aa8b44c001445e0fc72ec5fe68a79bbd970e8753.zip
opensim-SC_OLD-aa8b44c001445e0fc72ec5fe68a79bbd970e8753.tar.gz
opensim-SC_OLD-aa8b44c001445e0fc72ec5fe68a79bbd970e8753.tar.bz2
opensim-SC_OLD-aa8b44c001445e0fc72ec5fe68a79bbd970e8753.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.cs4
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