diff options
author | lbsa71 | 2008-01-10 08:56:03 +0000 |
---|---|---|
committer | lbsa71 | 2008-01-10 08:56:03 +0000 |
commit | f1c2dca7c1963b52d915ed6afd9bc345bf224de1 (patch) | |
tree | 7fa862ed76d5e26d9b40e10ee1d4a29736daefda | |
parent | Whitespace cleanup. (diff) | |
download | opensim-SC-f1c2dca7c1963b52d915ed6afd9bc345bf224de1.zip opensim-SC-f1c2dca7c1963b52d915ed6afd9bc345bf224de1.tar.gz opensim-SC-f1c2dca7c1963b52d915ed6afd9bc345bf224de1.tar.bz2 opensim-SC-f1c2dca7c1963b52d915ed6afd9bc345bf224de1.tar.xz |
* ProfileCurve is now XmlIgnored, and instead constructed from ProfileShape and ProfileHollow
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index abdd570..91c589a 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -82,7 +82,10 @@ namespace OpenSim.Framework | |||
82 | public ushort ProfileEnd; | 82 | public ushort ProfileEnd; |
83 | public LLVector3 Scale; | 83 | public LLVector3 Scale; |
84 | public byte PathCurve; | 84 | public byte PathCurve; |
85 | |||
86 | [XmlIgnore] // -- this one is re-constructed from ProfileShape and ProfileHollow | ||
85 | public byte ProfileCurve; | 87 | public byte ProfileCurve; |
88 | |||
86 | public ushort ProfileHollow; | 89 | public ushort ProfileHollow; |
87 | public sbyte PathRadiusOffset; | 90 | public sbyte PathRadiusOffset; |
88 | public byte PathRevolutions; | 91 | public byte PathRevolutions; |
@@ -120,7 +123,6 @@ namespace OpenSim.Framework | |||
120 | } | 123 | } |
121 | } | 124 | } |
122 | 125 | ||
123 | [XmlIgnore] | ||
124 | public HollowShape HollowShape | 126 | public HollowShape HollowShape |
125 | { | 127 | { |
126 | get { return (HollowShape)(ProfileCurve & 0xf0); } | 128 | get { return (HollowShape)(ProfileCurve & 0xf0); } |