diff options
| author | lbsa71 | 2008-01-22 15:07:30 +0000 |
|---|---|---|
| committer | lbsa71 | 2008-01-22 15:07:30 +0000 |
| commit | 8d0364e228ea038902e9249ea4550668d3a23f7d (patch) | |
| tree | 96d7c19e21183f7d9702b4a6ab647314536d6b44 /OpenSim/Region/Environment/Scenes/Scene.cs | |
| parent | Giving Mantis 393 a shot (not enough info to really know for sure though). (diff) | |
| download | opensim-SC_OLD-8d0364e228ea038902e9249ea4550668d3a23f7d.zip opensim-SC_OLD-8d0364e228ea038902e9249ea4550668d3a23f7d.tar.gz opensim-SC_OLD-8d0364e228ea038902e9249ea4550668d3a23f7d.tar.bz2 opensim-SC_OLD-8d0364e228ea038902e9249ea4550668d3a23f7d.tar.xz | |
* changed nonsensical PermissionMask and ObjectFlags mixup; if this causes perms weirdness, let's all work together to find the real cause.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
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); |