aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-23 03:29:50 +0000
committerJustin Clark-Casey (justincc)2012-11-23 03:29:50 +0000
commit36c6edac6903ecb704d382ed0959ff3cc44b73bb (patch)
tree2db0dd8594a9bc86a81e7dc68fa7d1ed07082fad /OpenSim/Region/CoreModules
parentminor: Add some console feedback on region restart and log who requested a re... (diff)
downloadopensim-SC_OLD-36c6edac6903ecb704d382ed0959ff3cc44b73bb.zip
opensim-SC_OLD-36c6edac6903ecb704d382ed0959ff3cc44b73bb.tar.gz
opensim-SC_OLD-36c6edac6903ecb704d382ed0959ff3cc44b73bb.tar.bz2
opensim-SC_OLD-36c6edac6903ecb704d382ed0959ff3cc44b73bb.tar.xz
Remove the redundant BypassPermissions() checks in EstateManagmentModule.
This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs21
1 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 757e5d4..f974a63 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
299 299
300 if ((estateAccessType & 4) != 0) // User add 300 if ((estateAccessType & 4) != 0) // User add
301 { 301 {
302 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 302 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
303 { 303 {
304 if ((estateAccessType & 1) != 0) // All estates 304 if ((estateAccessType & 1) != 0) // All estates
305 { 305 {
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
331 } 331 }
332 if ((estateAccessType & 8) != 0) // User remove 332 if ((estateAccessType & 8) != 0) // User remove
333 { 333 {
334 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 334 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
335 { 335 {
336 if ((estateAccessType & 1) != 0) // All estates 336 if ((estateAccessType & 1) != 0) // All estates
337 { 337 {
@@ -362,7 +362,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
362 } 362 }
363 if ((estateAccessType & 16) != 0) // Group add 363 if ((estateAccessType & 16) != 0) // Group add
364 { 364 {
365 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 365 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
366 { 366 {
367 if ((estateAccessType & 1) != 0) // All estates 367 if ((estateAccessType & 1) != 0) // All estates
368 { 368 {
@@ -391,9 +391,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
391 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); 391 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
392 } 392 }
393 } 393 }
394
394 if ((estateAccessType & 32) != 0) // Group remove 395 if ((estateAccessType & 32) != 0) // Group remove
395 { 396 {
396 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 397 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
397 { 398 {
398 if ((estateAccessType & 1) != 0) // All estates 399 if ((estateAccessType & 1) != 0) // All estates
399 { 400 {
@@ -422,9 +423,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
422 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); 423 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
423 } 424 }
424 } 425 }
426
425 if ((estateAccessType & 64) != 0) // Ban add 427 if ((estateAccessType & 64) != 0) // Ban add
426 { 428 {
427 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions()) 429 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
428 { 430 {
429 EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; 431 EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
430 432
@@ -499,9 +501,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
499 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); 501 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
500 } 502 }
501 } 503 }
504
502 if ((estateAccessType & 128) != 0) // Ban remove 505 if ((estateAccessType & 128) != 0) // Ban remove
503 { 506 {
504 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions()) 507 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
505 { 508 {
506 EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; 509 EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
507 510
@@ -554,9 +557,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
554 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); 557 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
555 } 558 }
556 } 559 }
560
557 if ((estateAccessType & 256) != 0) // Manager add 561 if ((estateAccessType & 256) != 0) // Manager add
558 { 562 {
559 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 563 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
560 { 564 {
561 if ((estateAccessType & 1) != 0) // All estates 565 if ((estateAccessType & 1) != 0) // All estates
562 { 566 {
@@ -585,9 +589,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
585 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); 589 remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
586 } 590 }
587 } 591 }
592
588 if ((estateAccessType & 512) != 0) // Manager remove 593 if ((estateAccessType & 512) != 0) // Manager remove
589 { 594 {
590 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) 595 if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
591 { 596 {
592 if ((estateAccessType & 1) != 0) // All estates 597 if ((estateAccessType & 1) != 0) // All estates
593 { 598 {