aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTom2010-08-06 09:53:40 -0700
committerTom2010-08-06 09:53:40 -0700
commit03da22378e23ae5c74d320d09878e7e2fa7756c8 (patch)
treec0bd19e0d7d2d62902696f4c4095cefdec1ba023 /OpenSim/Region
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-03da22378e23ae5c74d320d09878e7e2fa7756c8.zip
opensim-SC_OLD-03da22378e23ae5c74d320d09878e7e2fa7756c8.tar.gz
opensim-SC_OLD-03da22378e23ae5c74d320d09878e7e2fa7756c8.tar.bz2
opensim-SC_OLD-03da22378e23ae5c74d320d09878e7e2fa7756c8.tar.xz
Estate managers should be allowed to add and remove new users, groups and bans to/from the estate settings.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 940b535..ee151da 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
250 250
251 if ((estateAccessType & 4) != 0) // User add 251 if ((estateAccessType & 4) != 0) // User add
252 { 252 {
253 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 253 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
254 { 254 {
255 m_scene.RegionInfo.EstateSettings.AddEstateUser(user); 255 m_scene.RegionInfo.EstateSettings.AddEstateUser(user);
256 m_scene.RegionInfo.EstateSettings.Save(); 256 m_scene.RegionInfo.EstateSettings.Save();
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
265 } 265 }
266 if ((estateAccessType & 8) != 0) // User remove 266 if ((estateAccessType & 8) != 0) // User remove
267 { 267 {
268 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 268 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
269 { 269 {
270 m_scene.RegionInfo.EstateSettings.RemoveEstateUser(user); 270 m_scene.RegionInfo.EstateSettings.RemoveEstateUser(user);
271 m_scene.RegionInfo.EstateSettings.Save(); 271 m_scene.RegionInfo.EstateSettings.Save();
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
280 } 280 }
281 if ((estateAccessType & 16) != 0) // Group add 281 if ((estateAccessType & 16) != 0) // Group add
282 { 282 {
283 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 283 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
284 { 284 {
285 m_scene.RegionInfo.EstateSettings.AddEstateGroup(user); 285 m_scene.RegionInfo.EstateSettings.AddEstateGroup(user);
286 m_scene.RegionInfo.EstateSettings.Save(); 286 m_scene.RegionInfo.EstateSettings.Save();
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
294 } 294 }
295 if ((estateAccessType & 32) != 0) // Group remove 295 if ((estateAccessType & 32) != 0) // Group remove
296 { 296 {
297 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 297 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
298 { 298 {
299 m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user); 299 m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user);
300 m_scene.RegionInfo.EstateSettings.Save(); 300 m_scene.RegionInfo.EstateSettings.Save();