aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-30 19:38:10 +0100
committerJustin Clark-Casey (justincc)2014-05-30 19:40:10 +0100
commit8656b5e948b5865f431a6178992b2c0bd83899a3 (patch)
treeebf3fbffa8fa25d9ac155996e000023fef35e1bc /OpenSim/Framework/RegionInfo.cs
parentAdd some info about xbuild command line switches to clean and select between ... (diff)
downloadopensim-SC_OLD-8656b5e948b5865f431a6178992b2c0bd83899a3.zip
opensim-SC_OLD-8656b5e948b5865f431a6178992b2c0bd83899a3.tar.gz
opensim-SC_OLD-8656b5e948b5865f431a6178992b2c0bd83899a3.tar.bz2
opensim-SC_OLD-8656b5e948b5865f431a6178992b2c0bd83899a3.tar.xz
Fix bug where setting a parcel in a varregion for sale would make sale bitmap generation in WorldMapModule throw an exception on next startup.
This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ce14b58..7ac94a0 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -147,8 +147,29 @@ namespace OpenSim.Framework
147 public uint WorldLocX = 0; 147 public uint WorldLocX = 0;
148 public uint WorldLocY = 0; 148 public uint WorldLocY = 0;
149 public uint WorldLocZ = 0; 149 public uint WorldLocZ = 0;
150
151 /// <summary>
152 /// X dimension of the region.
153 /// </summary>
154 /// <remarks>
155 /// If this is a varregion then the default size set here will be replaced when we load the region config.
156 /// </remarks>
150 public uint RegionSizeX = Constants.RegionSize; 157 public uint RegionSizeX = Constants.RegionSize;
158
159 /// <summary>
160 /// X dimension of the region.
161 /// </summary>
162 /// <remarks>
163 /// If this is a varregion then the default size set here will be replaced when we load the region config.
164 /// </remarks>
151 public uint RegionSizeY = Constants.RegionSize; 165 public uint RegionSizeY = Constants.RegionSize;
166
167 /// <summary>
168 /// Z dimension of the region.
169 /// </summary>
170 /// <remarks>
171 /// XXX: Unknown if this accounts for regions with negative Z.
172 /// </remarks>
152 public uint RegionSizeZ = Constants.RegionHeight; 173 public uint RegionSizeZ = Constants.RegionHeight;
153 174
154 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); 175 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();