diff options
| author | Diva Canto | 2012-02-19 12:28:47 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-02-19 12:28:47 -0800 |
| commit | dcea23906bec0465ca70be558382bcf7f3c96bb0 (patch) | |
| tree | 00f68ade44e1f5d639902bd94b4459575e79f395 /OpenSim/Region/CoreModules | |
| parent | A few more tweaks on position updates and create child agents. Mono hates con... (diff) | |
| parent | Use localy defined name, TPFlags, for Constants.TeleportFlags (diff) | |
| download | opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.zip opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.gz opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.bz2 opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 d146901..cc42f7f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -272,7 +272,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 272 | ParcelFlags.AllowGroupScripts | | 272 | ParcelFlags.AllowGroupScripts | |
| 273 | ParcelFlags.CreateGroupObjects | | 273 | ParcelFlags.CreateGroupObjects | |
| 274 | ParcelFlags.AllowAPrimitiveEntry | | 274 | ParcelFlags.AllowAPrimitiveEntry | |
| 275 | ParcelFlags.AllowGroupObjectEntry); | 275 | ParcelFlags.AllowGroupObjectEntry | |
| 276 | ParcelFlags.AllowFly); | ||
| 276 | } | 277 | } |
| 277 | 278 | ||
| 278 | if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale)) | 279 | if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale)) |