ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Applying melanie's Landmark patch. Thanks Melanie!

Browse Source 
* 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.
This commit is contained in:
Teravus Ovares
2008-04-16 14:10:54 +00:00
parent 1eb0fedd93
commit 7c1f17b994
8 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/AssetLandmark.cs
View File

@@ -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);
}
}
}

3
OpenSim/Framework/EstateSettings.cs
View File

@@ -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",

4
OpenSim/Framework/IClientAPI.cs
View File

@@ -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;