aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs1
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs17
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 10fd7ae..dba3682 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1886,6 +1886,7 @@ namespace OpenSim.Region.ClientStack
1886 objdata.Sound = LLUUID.Zero; 1886 objdata.Sound = LLUUID.Zero;
1887 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 1887 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
1888 objdata.TextureEntry = ntex.ToBytes(); 1888 objdata.TextureEntry = ntex.ToBytes();
1889
1889 objdata.State = 0; 1890 objdata.State = 0;
1890 objdata.Data = new byte[0]; 1891 objdata.Data = new byte[0];
1891 1892
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 7e39b84..ecd458d 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -459,8 +459,17 @@ namespace OpenSim.Region.Environment.LandManagement
459 //Now for border control 459 //Now for border control
460 try 460 try
461 { 461 {
462 Land westParcel = getLandObject((x - 1) * 4, y * 4); 462 Land westParcel = null;
463 Land southParcel = getLandObject(x * 4, (y - 1) * 4); 463 Land southParcel = null;
464 if (x > 0)
465 {
466 westParcel = getLandObject((x - 1) * 4, y * 4);
467 }
468 if (y > 0)
469 {
470 southParcel = getLandObject(x * 4, (y - 1) * 4);
471 }
472
464 if (x == 0) 473 if (x == 0)
465 { 474 {
466 tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST); 475 tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
@@ -492,9 +501,9 @@ namespace OpenSim.Region.Environment.LandManagement
492 byteArray = new byte[LAND_BLOCKS_PER_PACKET]; 501 byteArray = new byte[LAND_BLOCKS_PER_PACKET];
493 } 502 }
494 } 503 }
495 catch (System.Exception) 504 catch (System.Exception e)
496 { 505 {
497 OpenSim.Framework.Console.MainLog.Instance.Debug("LAND", "Skipped Land checks because avatar is out of bounds"); 506 OpenSim.Framework.Console.MainLog.Instance.Debug("LAND", "Skipped Land checks because avatar is out of bounds: " + e.Message);
498 } 507 }
499 } 508 }
500 } 509 }