aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-08 00:10:19 -0400
committerTeravus Ovares (Dan Olivares)2009-08-08 00:10:19 -0400
commitbff26ccdbb94fbdf9623b0b00a16ef88549e648e (patch)
tree96b56e7c29b16f057ec8727744e2c920a34f51e9 /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.zip
opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.gz
opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.bz2
opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.xz
* More tweaking of the various services to work with nonstandard region sizes. * Now, what's available of the terrain will show and it'll be truncated if it's larger on Linden Clients. Parcel minimum is 64 (256/4) for the client to accept it.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index f41bdac..bb06996 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Region.CoreModules.World.Land
44 #region Member Variables 44 #region Member Variables
45 45
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private bool[,] m_landBitmap = new bool[64,64]; 47 private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;
48 private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
48 49
49 protected LandData m_landData = new LandData(); 50 protected LandData m_landData = new LandData();
50 protected Scene m_scene; 51 protected Scene m_scene;
@@ -630,7 +631,7 @@ namespace OpenSim.Region.CoreModules.World.Land
630 631
631 private bool[,] convertBytesToLandBitmap() 632 private bool[,] convertBytesToLandBitmap()
632 { 633 {
633 bool[,] tempConvertMap = new bool[64,64]; 634 bool[,] tempConvertMap = new bool[landArrayMax, landArrayMax];
634 tempConvertMap.Initialize(); 635 tempConvertMap.Initialize();
635 byte tempByte = 0; 636 byte tempByte = 0;
636 int x = 0, y = 0, i = 0, bitNum = 0; 637 int x = 0, y = 0, i = 0, bitNum = 0;