diff options
author | Justin Clark-Casey (justincc) | 2012-02-14 00:01:24 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-14 00:01:24 +0000 |
commit | b0d02adeee36c59c8cf7afe4d279bc82a211db1d (patch) | |
tree | e0a502f31a83accb31d46597885259213870e1fd /OpenSim | |
parent | Update [XEngine] AppDomainLoading advice in OpenSim.ini.example (diff) | |
parent | short circuit the expensive parts of the permission checking code (diff) | |
download | opensim-SC_OLD-b0d02adeee36c59c8cf7afe4d279bc82a211db1d.zip opensim-SC_OLD-b0d02adeee36c59c8cf7afe4d279bc82a211db1d.tar.gz opensim-SC_OLD-b0d02adeee36c59c8cf7afe4d279bc82a211db1d.tar.bz2 opensim-SC_OLD-b0d02adeee36c59c8cf7afe4d279bc82a211db1d.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index cdecd2f..f3c6a30 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -707,7 +707,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
707 | // Object owners should be able to edit their own content | 707 | // Object owners should be able to edit their own content |
708 | if (currentUser == objectOwner) | 708 | if (currentUser == objectOwner) |
709 | { | 709 | { |
710 | permission = true; | 710 | // there is no way that later code can change this back to false |
711 | // so just return true immediately and short circuit the more | ||
712 | // expensive group checks | ||
713 | return true; | ||
714 | |||
715 | //permission = true; | ||
711 | } | 716 | } |
712 | else if (group.IsAttachment) | 717 | else if (group.IsAttachment) |
713 | { | 718 | { |