Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2012-02-14 00:01:24 +00:00 · 2012-02-14 00:01:24 +00:00 · b0d02adeee
parent 48b962c401 04a195266b
commit b0d02adeee
1 changed files with 6 additions and 1 deletions
--- 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
            // Object owners should be able to edit their own content
            if (currentUser == objectOwner)
            {
-                permission = true;
+                // there is no way that later code can change this back to false
+                // so just return true immediately and short circuit the more
+                // expensive group checks
+                return true;
+                
+                //permission = true;
            }
            else if (group.IsAttachment)
            {