aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorMelanie2011-12-18 10:49:45 +0000
committerMelanie2011-12-18 10:49:45 +0000
commit759f1d2dbe0617786068195dfd695e0dfc2cc265 (patch)
tree8e6dcb6ba183abb16b4527376c5fd280693977bb /OpenSim/Region/CoreModules/World
parentMake raycast more efficient by checking exclusion flags earlier (diff)
parentProvide user feedback on execution of "backup" region console command (diff)
downloadopensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.zip
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.gz
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.bz2
opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index c1b8764..5e7d37a 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -384,9 +384,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
384 if (m_debugPermissions) 384 if (m_debugPermissions)
385 m_log.Debug("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName); 385 m_log.Debug("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName);
386 } 386 }
387 387
388 // Checks if the given group is active and if the user is a group member 388 /// <summary>
389 // with the powers requested (powers = 0 for no powers check) 389 /// Checks if the given group is active and if the user is a group member
390 /// with the powers requested (powers = 0 for no powers check)
391 /// </summary>
392 /// <param name="groupID"></param>
393 /// <param name="userID"></param>
394 /// <param name="powers"></param>
395 /// <returns></returns>
390 protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers) 396 protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers)
391 { 397 {
392 if (null == m_groupsModule) 398 if (null == m_groupsModule)