diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Estate')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 4aad3b1..d4f53ff 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
63 | else | 63 | else |
64 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 64 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
65 | 65 | ||
66 | if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId)) | 66 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) |
67 | estateOwner = remote_client.AgentId; | 67 | estateOwner = remote_client.AgentId; |
68 | 68 | ||
69 | remote_client.SendDetailedEstateData(invoice, | 69 | remote_client.SendDetailedEstateData(invoice, |
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
233 | switch (estateAccessType) | 233 | switch (estateAccessType) |
234 | { | 234 | { |
235 | case 64: | 235 | case 64: |
236 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, false) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 236 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions()) |
237 | { | 237 | { |
238 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; | 238 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; |
239 | 239 | ||
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
285 | } | 285 | } |
286 | break; | 286 | break; |
287 | case 128: | 287 | case 128: |
288 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, false) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 288 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions()) |
289 | { | 289 | { |
290 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; | 290 | EstateBan[] banlistcheck = m_scene.RegionInfo.EstateSettings.EstateBans; |
291 | 291 | ||
@@ -321,7 +321,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
321 | break; | 321 | break; |
322 | case 256: | 322 | case 256: |
323 | 323 | ||
324 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, true) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 324 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) |
325 | { | 325 | { |
326 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); | 326 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); |
327 | m_scene.RegionInfo.EstateSettings.Save(); | 327 | m_scene.RegionInfo.EstateSettings.Save(); |
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
334 | 334 | ||
335 | break; | 335 | break; |
336 | case 512: | 336 | case 512: |
337 | if (m_scene.ExternalChecks.ExternalChecksCanIssueEstateCommand(remote_client.AgentId, true) || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 337 | if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) |
338 | { | 338 | { |
339 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); | 339 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); |
340 | m_scene.RegionInfo.EstateSettings.Save(); | 340 | m_scene.RegionInfo.EstateSettings.Save(); |
@@ -742,7 +742,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
742 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 742 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
743 | 743 | ||
744 | // Fudge estate owner | 744 | // Fudge estate owner |
745 | //if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remoteClient.AgentId)) | 745 | //if (m_scene.Permissions.IsGod(remoteClient.AgentId)) |
746 | // args.SimOwner = remoteClient.AgentId; | 746 | // args.SimOwner = remoteClient.AgentId; |
747 | 747 | ||
748 | args.terrainBase0 = UUID.Zero; | 748 | args.terrainBase0 = UUID.Zero; |