diff options
| author | Melanie | 2012-02-19 14:57:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-19 14:57:51 +0000 |
| commit | 488ec594088ec49142b11a645f90a1030ea5f627 (patch) | |
| tree | b7a54a2d734d3b85f10985bca7a707a6c2c4f057 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.... (diff) | |
| download | opensim-SC-488ec594088ec49142b11a645f90a1030ea5f627.zip opensim-SC-488ec594088ec49142b11a645f90a1030ea5f627.tar.gz opensim-SC-488ec594088ec49142b11a645f90a1030ea5f627.tar.bz2 opensim-SC-488ec594088ec49142b11a645f90a1030ea5f627.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 91aa228..02a163f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -290,7 +290,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 290 | ParcelFlags.AllowGroupScripts | | 290 | ParcelFlags.AllowGroupScripts | |
| 291 | ParcelFlags.CreateGroupObjects | | 291 | ParcelFlags.CreateGroupObjects | |
| 292 | ParcelFlags.AllowAPrimitiveEntry | | 292 | ParcelFlags.AllowAPrimitiveEntry | |
| 293 | ParcelFlags.AllowGroupObjectEntry); | 293 | ParcelFlags.AllowGroupObjectEntry | |
| 294 | ParcelFlags.AllowFly); | ||
| 294 | } | 295 | } |
| 295 | 296 | ||
| 296 | if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale)) | 297 | if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale)) |