aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land
diff options
context:
space:
mode:
authorMelanie2011-01-23 23:29:25 +0000
committerMelanie2011-01-23 23:29:25 +0000
commit105deab601244584d779e8b7d1e8275b8aeb15ec (patch)
tree63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Region/CoreModules/World/Land
parentCompletely nixing flags from the client causes wearables to break. Fix it (diff)
parentFixes mantis #5343 (diff)
downloadopensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2
opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index f4ebbf0..a00b6b2 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -217,6 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Land
217 ParcelFlags.AllowDamage | 217 ParcelFlags.AllowDamage |
218 ParcelFlags.CreateObjects | 218 ParcelFlags.CreateObjects |
219 ParcelFlags.RestrictPushObject | 219 ParcelFlags.RestrictPushObject |
220 ParcelFlags.AllowOtherScripts |
220 ParcelFlags.AllowGroupScripts | 221 ParcelFlags.AllowGroupScripts |
221 ParcelFlags.CreateGroupObjects | 222 ParcelFlags.CreateGroupObjects |
222 ParcelFlags.AllowAPrimitiveEntry | 223 ParcelFlags.AllowAPrimitiveEntry |