diff options
| author | Melanie | 2012-03-18 20:44:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-18 20:44:56 +0000 |
| commit | c7e302864a2eef7f9587ed22286c96a6074ac5b3 (patch) | |
| tree | 8f0df2f66811309fd790966770434fa3ff68bfdf /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Amend to previous commit: normalize strings ToLower. (diff) | |
| download | opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.zip opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.gz opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.bz2 opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.xz | |
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
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 4 |
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 | |||
| 1664 | { | 1664 | { |
| 1665 | if (e.OwnerID == targetID) | 1665 | if (e.OwnerID == targetID) |
| 1666 | { | 1666 | { |
| 1667 | if (e.scriptScore >= 0.01) | 1667 | if (e.ContainsScripts()) |
| 1668 | { | 1668 | { |
| 1669 | returns.Add(e); | 1669 | returns.Add(e); |
| 1670 | } | 1670 | } |
| @@ -1681,7 +1681,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 1681 | ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y); | 1681 | ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y); |
| 1682 | if (landobject.LandData.OwnerID != e.OwnerID) | 1682 | if (landobject.LandData.OwnerID != e.OwnerID) |
| 1683 | { | 1683 | { |
| 1684 | if (e.scriptScore >= 0.01) | 1684 | if (e.ContainsScripts()) |
| 1685 | { | 1685 | { |
| 1686 | returns.Add(e); | 1686 | returns.Add(e); |
| 1687 | } | 1687 | } |