diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Region/Environment/Modules/World/Land | |
parent | DNE code cleanups (diff) | |
download | opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 28 |
2 files changed, 16 insertions, 16 deletions
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 | |||
263 | { | 263 | { |
264 | if (checkBan.isBannedFromLand(avatar.AgentId)) | 264 | if (checkBan.isBannedFromLand(avatar.AgentId)) |
265 | { | 265 | { |
266 | checkBan.sendLandProperties(-30000, false, (int)ParcelManager.ParcelResult.Single, avatar); | 266 | checkBan.sendLandProperties(-30000, false, (int)ParcelResult.Single, avatar); |
267 | return; //Only send one | 267 | return; //Only send one |
268 | } | 268 | } |
269 | if (checkBan.isRestrictedFromLand(avatar.AgentId)) | 269 | if (checkBan.isRestrictedFromLand(avatar.AgentId)) |
270 | { | 270 | { |
271 | checkBan.sendLandProperties(-40000, false, (int)ParcelManager.ParcelResult.Single, avatar); | 271 | checkBan.sendLandProperties(-40000, false, (int)ParcelResult.Single, avatar); |
272 | return; //Only send one | 272 | return; //Only send one |
273 | } | 273 | } |
274 | } | 274 | } |
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 | |||
162 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) | 162 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) |
163 | { | 163 | { |
164 | IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); | 164 | IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); |
165 | uint regionFlags = 336723974 & ~((uint)(Simulator.RegionFlags.AllowLandmark | Simulator.RegionFlags.AllowSetHome)); | 165 | uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome)); |
166 | if (estateModule != null) | 166 | if (estateModule != null) |
167 | regionFlags = estateModule.GetRegionFlags(); | 167 | regionFlags = estateModule.GetRegionFlags(); |
168 | 168 | ||
169 | // In a perfect world, this would have worked. | 169 | // In a perfect world, this would have worked. |
170 | // | 170 | // |
171 | // if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) | 171 | // if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) |
172 | // regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; | 172 | // regionFlags |= (uint)RegionFlags.AllowLandmark; |
173 | // if (landData.OwnerID == remote_client.AgentId) | 173 | // if (landData.OwnerID == remote_client.AgentId) |
174 | // regionFlags |= (uint)Simulator.RegionFlags.AllowSetHome; | 174 | // regionFlags |= (uint)RegionFlags.AllowSetHome; |
175 | remote_client.SendLandProperties(remote_client, sequence_id, | 175 | remote_client.SendLandProperties(remote_client, sequence_id, |
176 | snap_selection, request_result, landData, | 176 | snap_selection, request_result, landData, |
177 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, | 177 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, |
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
252 | { | 252 | { |
253 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 253 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
254 | entry.AgentID = avatar; | 254 | entry.AgentID = avatar; |
255 | entry.Flags = ParcelManager.AccessList.Ban; | 255 | entry.Flags = AccessList.Ban; |
256 | entry.Time = new DateTime(); | 256 | entry.Time = new DateTime(); |
257 | if (landData.ParcelAccessList.Contains(entry)) | 257 | if (landData.ParcelAccessList.Contains(entry)) |
258 | { | 258 | { |
@@ -269,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
269 | { | 269 | { |
270 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 270 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
271 | entry.AgentID = avatar; | 271 | entry.AgentID = avatar; |
272 | entry.Flags = ParcelManager.AccessList.Access; | 272 | entry.Flags = AccessList.Access; |
273 | entry.Time = new DateTime(); | 273 | entry.Time = new DateTime(); |
274 | if (!landData.ParcelAccessList.Contains(entry)) | 274 | if (!landData.ParcelAccessList.Contains(entry)) |
275 | { | 275 | { |
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
322 | 322 | ||
323 | #region AccessList Functions | 323 | #region AccessList Functions |
324 | 324 | ||
325 | public List<UUID> createAccessListArrayByFlag(ParcelManager.AccessList flag) | 325 | public List<UUID> createAccessListArrayByFlag(AccessList flag) |
326 | { | 326 | { |
327 | List<UUID> list = new List<UUID>(); | 327 | List<UUID> list = new List<UUID>(); |
328 | foreach (ParcelManager.ParcelAccessEntry entry in landData.ParcelAccessList) | 328 | foreach (ParcelManager.ParcelAccessEntry entry in landData.ParcelAccessList) |
@@ -344,16 +344,16 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
344 | IClientAPI remote_client) | 344 | IClientAPI remote_client) |
345 | { | 345 | { |
346 | 346 | ||
347 | if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) | 347 | if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both) |
348 | { | 348 | { |
349 | List<UUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); | 349 | List<UUID> avatars = createAccessListArrayByFlag(AccessList.Access); |
350 | remote_client.SendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.LocalID); | 350 | remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,landData.LocalID); |
351 | } | 351 | } |
352 | 352 | ||
353 | if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) | 353 | if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both) |
354 | { | 354 | { |
355 | List<UUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); | 355 | List<UUID> avatars = createAccessListArrayByFlag(AccessList.Ban); |
356 | remote_client.SendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.LocalID); | 356 | remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, landData.LocalID); |
357 | } | 357 | } |
358 | } | 358 | } |
359 | 359 | ||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
369 | List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>(); | 369 | List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>(); |
370 | foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) | 370 | foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) |
371 | { | 371 | { |
372 | if (entry.Flags == (ParcelManager.AccessList) flags) | 372 | if (entry.Flags == (AccessList) flags) |
373 | { | 373 | { |
374 | toRemove.Add(entry); | 374 | toRemove.Add(entry); |
375 | } | 375 | } |
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
384 | ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); | 384 | ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); |
385 | temp.AgentID = entry.AgentID; | 385 | temp.AgentID = entry.AgentID; |
386 | temp.Time = new DateTime(); //Pointless? Yes. | 386 | temp.Time = new DateTime(); //Pointless? Yes. |
387 | temp.Flags = (ParcelManager.AccessList) flags; | 387 | temp.Flags = (AccessList) flags; |
388 | 388 | ||
389 | if (!newData.ParcelAccessList.Contains(temp)) | 389 | if (!newData.ParcelAccessList.Contains(temp)) |
390 | { | 390 | { |