From 16b6738cdadc70966a93b6d025ae469738955dcb Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 26 Sep 2008 17:25:22 +0000 Subject: * Patch from JHurliman * Updates to libomv r2243, * Remove lots of unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will update OpenSim-libs in 10 minutes.. --- .../Modules/World/Land/LandManagementModule.cs | 4 ++-- .../Environment/Modules/World/Land/LandObject.cs | 28 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Land') diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index bf51edb..6ab5a57 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs @@ -263,12 +263,12 @@ namespace OpenSim.Region.Environment.Modules.World.Land { if (checkBan.isBannedFromLand(avatar.AgentId)) { - checkBan.sendLandProperties(-30000, false, (int)ParcelManager.ParcelResult.Single, avatar); + checkBan.sendLandProperties(-30000, false, (int)ParcelResult.Single, avatar); return; //Only send one } if (checkBan.isRestrictedFromLand(avatar.AgentId)) { - checkBan.sendLandProperties(-40000, false, (int)ParcelManager.ParcelResult.Single, avatar); + checkBan.sendLandProperties(-40000, false, (int)ParcelResult.Single, avatar); return; //Only send one } } diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 640b665..89d7b69 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -162,16 +162,16 @@ namespace OpenSim.Region.Environment.Modules.World.Land public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) { IEstateModule estateModule = m_scene.RequestModuleInterface(); - uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome)); + uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome)); if (estateModule != null) regionFlags = estateModule.GetRegionFlags(); // In a perfect world, this would have worked. // // if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) -// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; +// regionFlags |= (uint)RegionFlags.AllowLandmark; // if (landData.OwnerID == remote_client.AgentId) -// regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome; +// regionFlags |= (uint)RegionFlags.AllowSetHome; remote_client.SendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, @@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); entry.AgentID = avatar; - entry.Flags = ParcelManager.AccessList.Ban; + entry.Flags = AccessList.Ban; entry.Time = new DateTime(); if (landData.ParcelAccessList.Contains(entry)) { @@ -269,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); entry.AgentID = avatar; - entry.Flags = ParcelManager.AccessList.Access; + entry.Flags = AccessList.Access; entry.Time = new DateTime(); if (!landData.ParcelAccessList.Contains(entry)) { @@ -322,7 +322,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land #region AccessList Functions - public List createAccessListArrayByFlag(ParcelManager.AccessList flag) + public List createAccessListArrayByFlag(AccessList flag) { List list = new List(); foreach (ParcelManager.ParcelAccessEntry entry in landData.ParcelAccessList) @@ -344,16 +344,16 @@ namespace OpenSim.Region.Environment.Modules.World.Land IClientAPI remote_client) { - if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) + if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both) { - List avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); - remote_client.SendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.LocalID); + List avatars = createAccessListArrayByFlag(AccessList.Access); + remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,landData.LocalID); } - if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) + if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both) { - List avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); - remote_client.SendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.LocalID); + List avatars = createAccessListArrayByFlag(AccessList.Ban); + remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, landData.LocalID); } } @@ -369,7 +369,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land List toRemove = new List(); foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) { - if (entry.Flags == (ParcelManager.AccessList) flags) + if (entry.Flags == (AccessList) flags) { toRemove.Add(entry); } @@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); temp.AgentID = entry.AgentID; temp.Time = new DateTime(); //Pointless? Yes. - temp.Flags = (ParcelManager.AccessList) flags; + temp.Flags = (AccessList) flags; if (!newData.ParcelAccessList.Contains(temp)) { -- cgit v1.1