* changed nonsensical PermissionMask and ObjectFlags mixup; if this causes perms weirdness, let's all work together to find the real cause.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f32de2e..6defe30 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -933,7 +933,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 AddEntityFromStorage(group);
                 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
-                rootPart.ApplySanePermissions();
+                rootPart.TrimPermissions();
 
                 group.ApplyPhysics(m_physicalPrim);
                 //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
@@ -1065,7 +1065,7 @@ namespace OpenSim.Region.Environment.Scenes
             AddEntity(sceneOb);
             SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
             // if grass or tree, make phantom
-            //rootPart.ApplySanePermissions();
+            //rootPart.TrimPermissions();
             if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111))
             {
                 rootPart.AddFlag(LLObject.ObjectFlags.Phantom);