diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index d53201f..15540ea 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -2126,7 +2126,7 @@ namespace OpenSim.Region.ClientStack | |||
2126 | SetDefaultPrimPacketValues(objupdate); | 2126 | SetDefaultPrimPacketValues(objupdate); |
2127 | objupdate.UpdateFlags = flags; | 2127 | objupdate.UpdateFlags = flags; |
2128 | SetPrimPacketShapeData(objupdate, primShape); | 2128 | SetPrimPacketShapeData(objupdate, primShape); |
2129 | // if ((primShape.PCode == 111) || (primShape.PCode == 255)) | 2129 | |
2130 | if ((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass)) | 2130 | if ((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass)) |
2131 | { | 2131 | { |
2132 | objupdate.Data = new byte[1]; | 2132 | objupdate.Data = new byte[1]; |
@@ -2206,7 +2206,7 @@ namespace OpenSim.Region.ClientStack | |||
2206 | objdata.ParentID = 0; | 2206 | objdata.ParentID = 0; |
2207 | objdata.OwnerID = LLUUID.Zero; | 2207 | objdata.OwnerID = LLUUID.Zero; |
2208 | objdata.Scale = new LLVector3(1, 1, 1); | 2208 | objdata.Scale = new LLVector3(1, 1, 1); |
2209 | objdata.PCode = 47; | 2209 | objdata.PCode = (byte)PCode.Avatar; |
2210 | if (textureEntry != null) | 2210 | if (textureEntry != null) |
2211 | { | 2211 | { |
2212 | objdata.TextureEntry = textureEntry; | 2212 | objdata.TextureEntry = textureEntry; |
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; |