* removed unused PrimScale on PrimitiveBaseShape (use Scale instead)

* ignored bin

1 files changed, 11 insertions, 16 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index bccc36a..50959f6 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Framework
 
         public PrimitiveBaseShape()
         {
-            PCode = (byte)PCodeEnum.Primitive;
+            PCode = (byte) PCodeEnum.Primitive;
             ExtraParams = new byte[1];
             Textures = m_defaultTexture;
         }
@@ -125,29 +125,24 @@ namespace OpenSim.Framework
 
         public ProfileShape ProfileShape
         {
-            get { return (ProfileShape)(ProfileCurve & 0xf); }
+            get { return (ProfileShape) (ProfileCurve & 0xf); }
             set
             {
-                byte oldValueMasked = (byte)(ProfileCurve & 0xf0);
-                ProfileCurve = (byte)(oldValueMasked | (byte)value);
+                byte oldValueMasked = (byte) (ProfileCurve & 0xf0);
+                ProfileCurve = (byte) (oldValueMasked | (byte) value);
             }
         }
 
         public HollowShape HollowShape
         {
-            get { return (HollowShape)(ProfileCurve & 0xf0); }
+            get { return (HollowShape) (ProfileCurve & 0xf0); }
             set
             {
-                byte oldValueMasked = (byte)(ProfileCurve & 0x0f);
-                ProfileCurve = (byte)(oldValueMasked | (byte)value);
+                byte oldValueMasked = (byte) (ProfileCurve & 0x0f);
+                ProfileCurve = (byte) (oldValueMasked | (byte) value);
             }
         }
 
-        public LLVector3 PrimScale
-        {
-            get { return Scale; }
-        }
-
         public static PrimitiveBaseShape Default
         {
             get
@@ -171,7 +166,7 @@ namespace OpenSim.Framework
         {
             PrimitiveBaseShape shape = Create();
 
-            shape.PathCurve = (byte)Extrusion.Straight;
+            shape.PathCurve = (byte) Extrusion.Straight;
             shape.ProfileShape = ProfileShape.Square;
             shape.PathScaleX = 100;
             shape.PathScaleY = 100;
@@ -183,7 +178,7 @@ namespace OpenSim.Framework
         {
             PrimitiveBaseShape shape = Create();
 
-            shape.PathCurve = (byte)Extrusion.Curve1;
+            shape.PathCurve = (byte) Extrusion.Curve1;
             shape.ProfileShape = ProfileShape.Square;
 
             shape.PathScaleX = 100;
@@ -204,7 +199,7 @@ namespace OpenSim.Framework
 
         public void SetRadius(float radius)
         {
-            Scale.X = Scale.Y = radius * 2f;
+            Scale.X = Scale.Y = radius*2f;
         }
 
         //void returns need to change of course
@@ -214,7 +209,7 @@ namespace OpenSim.Framework
 
         public PrimitiveBaseShape Copy()
         {
-            return (PrimitiveBaseShape)MemberwiseClone();
+            return (PrimitiveBaseShape) MemberwiseClone();
         }
 
         public static PrimitiveBaseShape CreateCylinder(float radius, float heigth)