diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 3dbdd0f..4c36819 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -192,15 +192,6 @@ namespace OpenSim.Framework | |||
192 | 192 | ||
193 | public PrimitiveBaseShape() | 193 | public PrimitiveBaseShape() |
194 | { | 194 | { |
195 | PCode = (byte) PCodeEnum.Primitive; | ||
196 | m_textureEntry = DEFAULT_TEXTURE; | ||
197 | } | ||
198 | |||
199 | public PrimitiveBaseShape(bool noShape) | ||
200 | { | ||
201 | if (noShape) | ||
202 | return; | ||
203 | |||
204 | PCode = (byte)PCodeEnum.Primitive; | 195 | PCode = (byte)PCodeEnum.Primitive; |
205 | m_textureEntry = DEFAULT_TEXTURE; | 196 | m_textureEntry = DEFAULT_TEXTURE; |
206 | } | 197 | } |
@@ -245,7 +236,10 @@ namespace OpenSim.Framework | |||
245 | SculptTexture = prim.Sculpt.SculptTexture; | 236 | SculptTexture = prim.Sculpt.SculptTexture; |
246 | SculptType = (byte)prim.Sculpt.Type; | 237 | SculptType = (byte)prim.Sculpt.Type; |
247 | } | 238 | } |
248 | else SculptType = (byte)OpenMetaverse.SculptType.None; | 239 | else |
240 | { | ||
241 | SculptType = (byte)OpenMetaverse.SculptType.None; | ||
242 | } | ||
249 | } | 243 | } |
250 | 244 | ||
251 | [XmlIgnore] | 245 | [XmlIgnore] |
@@ -337,9 +331,9 @@ namespace OpenSim.Framework | |||
337 | _scale = new Vector3(side, side, side); | 331 | _scale = new Vector3(side, side, side); |
338 | } | 332 | } |
339 | 333 | ||
340 | public void SetHeigth(float heigth) | 334 | public void SetHeigth(float height) |
341 | { | 335 | { |
342 | _scale.Z = heigth; | 336 | _scale.Z = height; |
343 | } | 337 | } |
344 | 338 | ||
345 | public void SetRadius(float radius) | 339 | public void SetRadius(float radius) |