From 244a9282d0b74773dd21df396604b6b0b3c9813f Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 4 Aug 2008 15:19:10 +0000
Subject: Addresses Mantis #1886 Forces the landmark and menu flags to be
 always set, like in previous releases. This will cause the parcel based
 restriction on setting landmarks to have no effect, until it is implemented
 properly

---
 .../Modules/World/Estate/EstateManagementModule.cs            |  6 ++++--
 OpenSim/Region/Environment/Modules/World/Land/LandObject.cs   | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 44f9a93..6b82994 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -761,8 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
             if (m_scene.RegionInfo.RegionSettings.Sandbox)
                 flags |= Simulator.RegionFlags.Sandbox;
 
-            // Handled in LandObject.cs: AllowLandmark
-            // Handled in LandObject.cs: AllowSetHome
+			// Fudge these to always on, so the menu options activate
+			//
+			flags |= Simulator.RegionFlags.AllowLandmark;
+			flags |= Simulator.RegionFlags.AllowSetHome;
 
             // TODO: SkipUpdateInterestList
 
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 8abfcf8..15a68c1 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -165,10 +165,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land
             uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome));
             if (estateModule != null)
                 regionFlags = estateModule.GetRegionFlags();
-            if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
-                regionFlags |=  (uint)Simulator.RegionFlags.AllowLandmark;
-            if (landData.OwnerID == remote_client.AgentId)
-                regionFlags |=  (uint)Simulator.RegionFlags.AllowSetHome;
+
+			// In a perfect world, this would have worked.
+			//
+//            if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
+//                regionFlags |=  (uint)Simulator.RegionFlags.AllowLandmark;
+//            if (landData.OwnerID == remote_client.AgentId)
+//                regionFlags |=  (uint)Simulator.RegionFlags.AllowSetHome;
             remote_client.SendLandProperties(remote_client, sequence_id,
                     snap_selection, request_result, landData,
                     (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
-- 
cgit v1.1