OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
0.6.0-stable
Melanie Thielker 2008-08-04 15:19:10 +00:00
parent 7480a91c09
commit 244a9282d0
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@ -761,8 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
if (m_scene.RegionInfo.RegionSettings.Sandbox) if (m_scene.RegionInfo.RegionSettings.Sandbox)
flags |= Simulator.RegionFlags.Sandbox; flags |= Simulator.RegionFlags.Sandbox;
// Handled in LandObject.cs: AllowLandmark // Fudge these to always on, so the menu options activate
// Handled in LandObject.cs: AllowSetHome //
flags |= Simulator.RegionFlags.AllowLandmark;
flags |= Simulator.RegionFlags.AllowSetHome;
// TODO: SkipUpdateInterestList // TODO: SkipUpdateInterestList

11
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@ -165,10 +165,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land
uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome)); uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome));
if (estateModule != null) if (estateModule != null)
regionFlags = estateModule.GetRegionFlags(); regionFlags = estateModule.GetRegionFlags();
if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; // In a perfect world, this would have worked.
if (landData.OwnerID == remote_client.AgentId) //
regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome; // 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, remote_client.SendLandProperties(remote_client, sequence_id,
snap_selection, request_result, landData, snap_selection, request_result, landData,
(float)m_scene.RegionInfo.RegionSettings.ObjectBonus, (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,