aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
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
933 { 933 {
934 AddEntityFromStorage(group); 934 AddEntityFromStorage(group);
935 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 935 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
936 rootPart.ApplySanePermissions(); 936 rootPart.TrimPermissions();
937 937
938 group.ApplyPhysics(m_physicalPrim); 938 group.ApplyPhysics(m_physicalPrim);
939 //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); 939 //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
@@ -1065,7 +1065,7 @@ namespace OpenSim.Region.Environment.Scenes
1065 AddEntity(sceneOb); 1065 AddEntity(sceneOb);
1066 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 1066 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
1067 // if grass or tree, make phantom 1067 // if grass or tree, make phantom
1068 //rootPart.ApplySanePermissions(); 1068 //rootPart.TrimPermissions();
1069 if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111)) 1069 if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111))
1070 { 1070 {
1071 rootPart.AddFlag(LLObject.ObjectFlags.Phantom); 1071 rootPart.AddFlag(LLObject.ObjectFlags.Phantom);