diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index fdac418..07d00c0 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -761,9 +761,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 761 | int ty = min_y * 4; | 761 | int ty = min_y * 4; |
| 762 | if (ty > ((int)Constants.RegionSize - 1)) | 762 | if (ty > ((int)Constants.RegionSize - 1)) |
| 763 | ty = ((int)Constants.RegionSize - 1); | 763 | ty = ((int)Constants.RegionSize - 1); |
| 764 | |||
| 764 | LandData.AABBMin = | 765 | LandData.AABBMin = |
| 765 | new Vector3((float) (min_x * 4), (float) (min_y * 4), | 766 | new Vector3( |
| 766 | (float) m_scene.Heightmap[tx, ty]); | 767 | (float)(min_x * 4), (float)(min_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); |
| 767 | 768 | ||
| 768 | tx = max_x * 4; | 769 | tx = max_x * 4; |
| 769 | if (tx > ((int)Constants.RegionSize - 1)) | 770 | if (tx > ((int)Constants.RegionSize - 1)) |
| @@ -771,9 +772,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 771 | ty = max_y * 4; | 772 | ty = max_y * 4; |
| 772 | if (ty > ((int)Constants.RegionSize - 1)) | 773 | if (ty > ((int)Constants.RegionSize - 1)) |
| 773 | ty = ((int)Constants.RegionSize - 1); | 774 | ty = ((int)Constants.RegionSize - 1); |
| 774 | LandData.AABBMax = | 775 | |
| 775 | new Vector3((float) (max_x * 4), (float) (max_y * 4), | 776 | LandData.AABBMax |
| 776 | (float) m_scene.Heightmap[tx, ty]); | 777 | = new Vector3( |
| 778 | (float)(max_x * 4), (float)(max_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); | ||
| 779 | |||
| 777 | LandData.Area = tempArea; | 780 | LandData.Area = tempArea; |
| 778 | } | 781 | } |
| 779 | 782 | ||