aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-03-17 17:23:49 +0000
committerJeff Ames2008-03-17 17:23:49 +0000
commit7d1dcf3e68372a0692615c19ade95365ed633fcf (patch)
tree007138f9653de6baad72e1cd4e0bc826851e522b
parentReplaced some Console.WriteLine calls with writes to log. (diff)
downloadopensim-SC_OLD-7d1dcf3e68372a0692615c19ade95365ed633fcf.zip
opensim-SC_OLD-7d1dcf3e68372a0692615c19ade95365ed633fcf.tar.gz
opensim-SC_OLD-7d1dcf3e68372a0692615c19ade95365ed633fcf.tar.bz2
opensim-SC_OLD-7d1dcf3e68372a0692615c19ade95365ed633fcf.tar.xz
Replaced some magic PCode numbers with enum values.
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 856f819..d0af5a8 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -53,7 +53,11 @@ namespace OpenSim.Framework
53 public enum PCodeEnum : byte 53 public enum PCodeEnum : byte
54 { 54 {
55 Primitive = 9, 55 Primitive = 9,
56 Avatar = 47 56 Avatar = 47,
57 Grass = 95,
58 NewTree = 111,
59 ParticleSystem = 143,
60 Tree = 255
57 } 61 }
58 62
59 public enum Extrusion : byte 63 public enum Extrusion : byte
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;