* Applying melanie's Landmark patch. Thanks Melanie!

* To make a landmark, you currently have to enable admin options in the advanced menu first.  We're working on this..   however use the admin options solution in the mean time.

3 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index fe6f835..e0f5415 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -35,6 +35,7 @@ namespace OpenSim.Framework
         public int Version;
         public LLVector3 Position;
         public LLUUID RegionID;
+                public ulong RegionHandle;
 
         public AssetLandmark(AssetBase a)
         {
@@ -54,6 +55,7 @@ namespace OpenSim.Framework
             int.TryParse(parts[0].Substring(17, 1), out Version);
             LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
             LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
+            ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
         }
     }
 }
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 42154e9..02b7f27 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -128,6 +128,7 @@ namespace OpenSim.Framework
             get { return m_regionFlags; }
             set
             {
+                //m_regionFlags = (Simulator.RegionFlags)0x400000;
                 m_regionFlags = value;
                 configMember.forceSetConfigurationOption("region_flags", ((uint)m_regionFlags).ToString());
             }
@@ -784,7 +785,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
                                                 "0", true);
             configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty,
-                                                "0", true);
+                                                "4194304", true); //The String value of RegionFlags.RestrictPushObject
             configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "21",
                                                 true);
             configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c0f7fce..75e6fcd 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -260,6 +260,9 @@ namespace OpenSim.Framework
     public delegate void TeleportLocationRequest(
         IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
 
+    public delegate void TeleportLandmarkRequest(
+        IClientAPI remoteClient, ulong regionHandle, LLVector3 position);
+
     public delegate void DisconnectUser();
 
     public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID);
@@ -458,6 +461,7 @@ namespace OpenSim.Framework
         event DisconnectUser OnDisconnectUser;
         event RequestAvatarProperties OnRequestAvatarProperties;
         event SetAlwaysRun OnSetAlwaysRun;
+        event TeleportLandmarkRequest OnTeleportLandmarkRequest;
         event GenericCall4 OnDeRezObject;
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall2 OnRequestWearables;