*Removed some exceptions that were thrown in Land that is no longer needed.

1 files changed, 18 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index da17a69..11ff0ee 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -227,6 +227,19 @@ namespace OpenSim.Region.Environment.LandManagement
             }
         }
 
+        public bool isEitherBannedOrRestricted(LLUUID avatar)
+        {
+            if (isBannedFromLand(avatar))
+            {
+                return true;
+            }
+            else if (isRestrictedFromLand(avatar))
+            {
+                return true;
+            }
+            return false;
+        }
+
         public bool isBannedFromLand(LLUUID avatar)
         {
             if ((this.landData.landFlags & (uint)Parcel.ParcelFlags.UseBanList) > 0)
@@ -274,9 +287,12 @@ namespace OpenSim.Region.Environment.LandManagement
                 Land over =
                     m_scene.LandManager.getLandObject((int) Math.Round(avatars[i].AbsolutePosition.X),
                                                       (int) Math.Round(avatars[i].AbsolutePosition.Y));
-                if (over.landData.localID == landData.localID)
+                if (over != null)
                 {
-                    sendLandUpdateToClient(avatars[i].ControllingClient);
+                    if (over.landData.localID == landData.localID)
+                    {
+                        sendLandUpdateToClient(avatars[i].ControllingClient);
+                    }
                 }
             }
         }