aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 5d99f22..3e5610c 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Environment.Scenes
335 objupdate.ObjectData[0].ParentID = 0; 335 objupdate.ObjectData[0].ParentID = 0;
336 objupdate.ObjectData[0].OwnerID = LLUUID.Zero; 336 objupdate.ObjectData[0].OwnerID = LLUUID.Zero;
337 objupdate.ObjectData[0].Scale = new LLVector3(1, 1, 1); 337 objupdate.ObjectData[0].Scale = new LLVector3(1, 1, 1);
338 objupdate.ObjectData[0].PCode = 47; 338 objupdate.ObjectData[0].PCode = (byte)PCode.Avatar;
339 objupdate.ObjectData[0].TextureEntry = ScenePresence.DefaultTexture; 339 objupdate.ObjectData[0].TextureEntry = ScenePresence.DefaultTexture;
340 340
341 objupdate.ObjectData[0].ID = av.LocalId; 341 objupdate.ObjectData[0].ID = av.LocalId;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 19dbbc9..9466ab9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1121,7 +1121,7 @@ namespace OpenSim.Region.Environment.Scenes
1121 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 1121 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
1122 // if grass or tree, make phantom 1122 // if grass or tree, make phantom
1123 //rootPart.TrimPermissions(); 1123 //rootPart.TrimPermissions();
1124 if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111)) 1124 if ((rootPart.Shape.PCode == (byte)PCode.Grass) || (rootPart.Shape.PCode == (byte)PCode.Tree) || (rootPart.Shape.PCode == (byte)PCode.NewTree))
1125 { 1125 {
1126 rootPart.AddFlag(LLObject.ObjectFlags.Phantom); 1126 rootPart.AddFlag(LLObject.ObjectFlags.Phantom);
1127 //rootPart.ObjectFlags += (uint)LLObject.ObjectFlags.Phantom; 1127 //rootPart.ObjectFlags += (uint)LLObject.ObjectFlags.Phantom;