aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorMelanie2011-04-08 04:16:29 +0100
committerMelanie2011-04-08 04:16:29 +0100
commit738daadaceada157eb0a8ea4a3437e037859b4d2 (patch)
tree1d0f8d63180928d77a7842e73c56e922666af75b /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentAdd support for the new display name related functions in LSL. This does not (diff)
parenttrivial whitespace removal to trigger a panda rebuild (diff)
downloadopensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.zip
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.gz
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.bz2
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs14
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 57c7fc6..fe6b83a 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -736,23 +736,11 @@ namespace OpenSim.Region.CoreModules.World.Land
736 return LandBitmap; 736 return LandBitmap;
737 } 737 }
738 738
739 /// <summary>
740 /// Full sim land object creation
741 /// </summary>
742 /// <returns></returns>
743 public bool[,] BasicFullRegionLandBitmap() 739 public bool[,] BasicFullRegionLandBitmap()
744 { 740 {
745 return GetSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize); 741 return GetSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);
746 } 742 }
747 743
748 /// <summary>
749 /// Used to modify the bitmap between the x and y points. Points use 64 scale
750 /// </summary>
751 /// <param name="start_x"></param>
752 /// <param name="start_y"></param>
753 /// <param name="end_x"></param>
754 /// <param name="end_y"></param>
755 /// <returns></returns>
756 public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y) 744 public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
757 { 745 {
758 bool[,] tempBitmap = new bool[64,64]; 746 bool[,] tempBitmap = new bool[64,64];