diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 640a024..cc42f7f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -169,11 +169,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
169 | return newLand; | 169 | return newLand; |
170 | } | 170 | } |
171 | 171 | ||
172 | public ILandObject MemberwiseCopy() | ||
173 | { | ||
174 | return (ILandObject)this.MemberwiseClone(); | ||
175 | } | ||
176 | |||
177 | static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount; | 172 | static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount; |
178 | static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount; | 173 | static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount; |
179 | 174 | ||
@@ -247,13 +242,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
247 | m_lastSeqId = seq_id; | 242 | m_lastSeqId = seq_id; |
248 | } | 243 | } |
249 | 244 | ||
250 | ILandObject landToSend = this; | ||
251 | m_scene.Permissions.LandObjectForClient(remote_client.AgentId, (ILandObject)this, out landToSend); | ||
252 | remote_client.SendLandProperties(seq_id, | 245 | remote_client.SendLandProperties(seq_id, |
253 | snap_selection, request_result, landToSend, | 246 | snap_selection, request_result, this, |
254 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, | 247 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, |
255 | GetParcelMaxPrimCount(), | 248 | GetParcelMaxPrimCount(), |
256 | GetSimulatorMaxPrimCount(), regionFlags); | 249 | GetSimulatorMaxPrimCount(), regionFlags); |
257 | } | 250 | } |
258 | 251 | ||
259 | public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client) | 252 | public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client) |
@@ -482,32 +475,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
482 | return false; | 475 | return false; |
483 | } | 476 | } |
484 | 477 | ||
485 | public bool IsAllowedInLand(UUID avatar) | ||
486 | { | ||
487 | ExpireAccessList(); | ||
488 | |||
489 | if (m_scene.Permissions.IsAdministrator(avatar)) | ||
490 | return true; | ||
491 | |||
492 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | ||
493 | return true; | ||
494 | |||
495 | if (avatar == LandData.OwnerID) | ||
496 | return true; | ||
497 | |||
498 | if (LandData.ParcelAccessList.FindIndex( | ||
499 | delegate(LandAccessEntry e) | ||
500 | { | ||
501 | if (e.AgentID == avatar && e.Flags == AccessList.Access) | ||
502 | return true; | ||
503 | return false; | ||
504 | }) != -1) | ||
505 | { | ||
506 | return true; | ||
507 | } | ||
508 | return false; | ||
509 | } | ||
510 | |||
511 | public void SendLandUpdateToClient(IClientAPI remote_client) | 478 | public void SendLandUpdateToClient(IClientAPI remote_client) |
512 | { | 479 | { |
513 | SendLandProperties(0, false, 0, remote_client); | 480 | SendLandProperties(0, false, 0, remote_client); |