aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-07-01 21:04:33 +0000
committerMW2007-07-01 21:04:33 +0000
commit2852cda727f86567c18c6fab193ed31195c9934c (patch)
treeddb899dbef28d3267f0a439ec84d48a676a6365d /OpenSim/Framework/General
parent* replaced some more of those butt-fuggly attr constructs with nice Get<> cal... (diff)
downloadopensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.zip
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.gz
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.bz2
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.xz
More work on SceneObject/Primitive and building (Linking is a work in progress as is all). Committing now as I've finished for the night and will be continued tomorrow.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs4
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs5
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 2110b74..d62247c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -163,8 +163,8 @@ namespace OpenSim.Framework.Interfaces
163 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 163 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
164 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags); 164 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
165 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags); 165 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
166 void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID); 166 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
167 void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID); 167 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);
168 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 168 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
169 } 169 }
170} 170}
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 094a8a0..7c8de16 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Framework.Types
36 public LLVector3 Scale; 36 public LLVector3 Scale;
37 public byte PathCurve; 37 public byte PathCurve;
38 public byte ProfileCurve; 38 public byte ProfileCurve;
39 public uint ParentID = 0;
40 public ushort ProfileHollow; 39 public ushort ProfileHollow;
41 public sbyte PathRadiusOffset; 40 public sbyte PathRadiusOffset;
42 public byte PathRevolutions; 41 public byte PathRevolutions;
@@ -73,13 +72,13 @@ namespace OpenSim.Framework.Types
73 72
74 } 73 }
75 74
76 public static PrimitiveBaseShape DefaultCube() 75 public static PrimitiveBaseShape DefaultBox()
77 { 76 {
78 PrimitiveBaseShape primShape = new PrimitiveBaseShape(); 77 PrimitiveBaseShape primShape = new PrimitiveBaseShape();
79 78
79 primShape.type = ShapeType.Box;
80 primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 80 primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
81 primShape.PCode = 9; 81 primShape.PCode = 9;
82 primShape.ParentID = 0;
83 primShape.PathBegin = 0; 82 primShape.PathBegin = 0;
84 primShape.PathEnd = 0; 83 primShape.PathEnd = 0;
85 primShape.PathScaleX = 0; 84 primShape.PathScaleX = 0;