aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2014-06-01 16:45:37 -0700
committerDiva Canto2014-06-01 16:45:37 -0700
commit3aa99b9a7f6843e54522c75d0071f4f99d0310b9 (patch)
tree49708fe19bf4f9e204af0938d8f5f12ac46a4867 /OpenSim
parentCorrect minor bug regarding packing of estate bans (diff)
downloadopensim-SC-3aa99b9a7f6843e54522c75d0071f4f99d0310b9.zip
opensim-SC-3aa99b9a7f6843e54522c75d0071f4f99d0310b9.tar.gz
opensim-SC-3aa99b9a7f6843e54522c75d0071f4f99d0310b9.tar.bz2
opensim-SC-3aa99b9a7f6843e54522c75d0071f4f99d0310b9.tar.xz
Fixes a permissions bug where a user with group powers to always rez was not being given permission to rez on group land.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index e6a4283..d8f9f8c 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -469,7 +469,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
469 469
470 return false; 470 return false;
471 } 471 }
472 472
473 /// <summary> 473 /// <summary>
474 /// Parse a user set configuration setting 474 /// Parse a user set configuration setting
475 /// </summary> 475 /// </summary>
@@ -1473,6 +1473,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1473 { 1473 {
1474 return true; 1474 return true;
1475 } 1475 }
1476 else if (parcel.LandData.GroupID != UUID.Zero && IsGroupMember(parcel.LandData.GroupID, owner, (ulong)GroupPowers.AllowRez))
1477 {
1478 return true;
1479 }
1476 else 1480 else
1477 { 1481 {
1478 return false; 1482 return false;