Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 0f83d82..02ac091 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1664,7 +1664,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (e.OwnerID == targetID)
                         {
-                            if (e.scriptScore >= 0.01)
+                            if (e.ContainsScripts())
                             {
                                 returns.Add(e);
                             }
@@ -1681,7 +1681,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
                             if (landobject.LandData.OwnerID != e.OwnerID)
                             {
-                                if (e.scriptScore >= 0.01)
+                                if (e.ContainsScripts())
                                 {
                                     returns.Add(e);
                                 }